抢晒镜修改

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);
                 }

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{

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());
         }

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());

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">