From 93a6715af934daf8dbac1a48f5dfded5b30b74bd Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Fri, 28 Aug 2020 11:43:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A2=E6=99=92=E9=95=9C=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/lz/common/utils/DingTalkUtil.java  |  1 +
 .../modules/sys/controller/SysLoginController.java   |  1 +
 .../java/com/lz/modules/sys/oauth2/OAuth2Realm.java  |  1 +
 .../service/app/impl/ResultRecordServiceImpl.java    |  2 ++
 src/main/resources/mapper/app/ResultRecordMapper.xml | 12 +++++++++++-
 5 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/lz/common/utils/DingTalkUtil.java b/src/main/java/com/lz/common/utils/DingTalkUtil.java
index d18895e4..8c6c79a9 100644
--- a/src/main/java/com/lz/common/utils/DingTalkUtil.java
+++ b/src/main/java/com/lz/common/utils/DingTalkUtil.java
@@ -358,6 +358,7 @@ public class DingTalkUtil {
                     user.setStatus(1);
                     user.setType(1);
                     user.setRealName(staffEntity.getName());
+                    user.setUsername(staffEntity.getMobile());
                     user.setUserNo(staffEntity.getMobile());
                     return sysUserTokenService.createTokenSetTokenCode(user,  code);
                 }
diff --git a/src/main/java/com/lz/modules/sys/controller/SysLoginController.java b/src/main/java/com/lz/modules/sys/controller/SysLoginController.java
index 73cc3977..0b74958b 100644
--- a/src/main/java/com/lz/modules/sys/controller/SysLoginController.java
+++ b/src/main/java/com/lz/modules/sys/controller/SysLoginController.java
@@ -185,6 +185,7 @@ public class SysLoginController extends AbstractController {
                 user.setSalt(staffEntity.getSalt());
                 user.setStatus(1);
                 user.setType(1);
+                user.setUsername(staffEntity.getMobile());
                 user.setRealName(staffEntity.getName());
                 user.setUserNo(staffEntity.getMobile());
             }else{
diff --git a/src/main/java/com/lz/modules/sys/oauth2/OAuth2Realm.java b/src/main/java/com/lz/modules/sys/oauth2/OAuth2Realm.java
index 9444261b..ca8b60a3 100644
--- a/src/main/java/com/lz/modules/sys/oauth2/OAuth2Realm.java
+++ b/src/main/java/com/lz/modules/sys/oauth2/OAuth2Realm.java
@@ -83,6 +83,7 @@ public class OAuth2Realm extends AuthorizingRealm {
             user.setSalt(staffEntity.getSalt());
             user.setStatus(1);
             user.setType(1);
+            user.setUsername(staffEntity.getMobile());
             user.setRealName(staffEntity.getName());
             user.setUserNo(staffEntity.getMobile());
         }
diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
index ae270259..caee497f 100644
--- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
+++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
@@ -354,6 +354,8 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
                 approvalList.add(flowRelation.getChild());
             }
         }
+        log.info("approvalList approval : " + Arrays.toString(approvalList.toArray()) );
+
         List<Flow> flows = flowService.selectByFlowId(flowId);
         FlowRecord lastFlowRecord = flowRecordService.selectLastFlowRecordByRecordId(resultRecordId);
         FlowRecord notFlowRecord = flowRecordService.selectNotApprovalStaffIdFlowRecords(resultRecord.getId());
diff --git a/src/main/resources/mapper/app/ResultRecordMapper.xml b/src/main/resources/mapper/app/ResultRecordMapper.xml
index 28f64ad7..703555ba 100644
--- a/src/main/resources/mapper/app/ResultRecordMapper.xml
+++ b/src/main/resources/mapper/app/ResultRecordMapper.xml
@@ -223,7 +223,17 @@
             and rd.current_approval_staff_id = #{req.approvalStaffId}
         </if>
         order by fr.id desc )
-        a GROUP by id order by department_id desc
+        a GROUP by id
+        <choose>
+            <when test="req.statusList != null and req.statusList.size() > 0">
+                 order by department_id desc
+            </when>
+            <otherwise>
+                 order by id desc
+            </otherwise>
+        </choose>
+
+
     </select>
 
     <update id="updateFlowStaffIdRoleToNull">