修改登录模式

sop-api/src/main/java/com/qmth/sop/server/api/SysController.java

@@ -105,9 +105,9 @@ public class SysController {
         List<SysUser> sysUserList = null;
         if (login.getType() == LoginTypeEnum.ACCOUNT) {//账号登录
             // 非空校验
-            Optional.ofNullable(login.getMobileNumber()).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("手机号不能为空"));
+            Optional.ofNullable(login.getLoginName()).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("用户名不能为空"));
             Optional.ofNullable(login.getPassword()).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("密码不能为空"));
-            sysUserList = sysUserService.list(new QueryWrapper<SysUser>().lambda().eq(SysUser::getMobileNumber, login.getMobileNumber()));
+            sysUserList = sysUserService.list(new QueryWrapper<SysUser>().lambda().eq(SysUser::getLoginName, login.getLoginName()));
             if (CollectionUtils.isEmpty(sysUserList)) {
                 throw ExceptionResultEnum.ERROR.exception("用户不存在");
             }

sop-business/src/main/java/com/qmth/sop/business/activiti/service/impl/ActivitiServiceImpl.java

@@ -814,6 +814,9 @@ public class ActivitiServiceImpl implements ActivitiService {
             for (TFFlowViewLogResult t : flowApproveHistoryList) {
                 t.setMessageType(FlowMsgTypeEnum.STANDARD);
                 approveSetupMap.put(t.getApproveSetup(), t.getApproveSetup());
+                if (Objects.nonNull(t.getApproveOperation())) {
+                    t.setApproveRemark(t.getApproveOperation().getTitle());
+                }
             }
         }
         for (Map.Entry<String, FlowTaskResult> entry : setupMap.entrySet()) {

sop-business/src/main/java/com/qmth/sop/business/service/impl/SysUserServiceImpl.java

@@ -346,11 +346,14 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                 } else if (Objects.nonNull(dbUser.getOrgId()) && !dbUser.getOrgId().equals(sysUser.getOrgId())) {
                     sysUserService.removeUserInfo(sysUser.getId(), true);
                 }
-                //如果修改了机构或手机号，需更新用户缓存（也需要重新登录）
+                //如果修改了机构或手机号，需更新用户缓存
                 if (Objects.nonNull(dbUser.getOrgId()) && (dbUser.getOrgId().longValue() != sysUser.getOrgId().longValue()
                         || !Objects.equals(dbUser.getMobileNumber(), sysUser.getMobileNumber()))) {
-//                    commonCacheService.updateUserCache(sysUser.getId());
-//                    commonCacheService.updateUserAuthCache(sysUser.getId());
+                    commonCacheService.updateUserCache(sysUser.getId());
+                    commonCacheService.updateUserAuthCache(sysUser.getId());
+                }
+                //修改登录名需重新登录
+                if (Objects.nonNull(dbUser.getLoginName()) && Objects.nonNull(sysUser.getLoginName()) && !Objects.equals(dbUser.getLoginName(), sysUser.getLoginName())) {
                     sysUserService.removeUserInfo(sysUser.getId(), true);
                 }
             }

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBDingApplyServiceImpl.java

@@ -363,11 +363,8 @@ public class TBDingApplyServiceImpl extends ServiceImpl<TBDingApplyMapper, TBDin
             for (TFFlowViewLogResult t : flowApproveHistoryList) {
                 t.setMessageType(FlowMsgTypeEnum.STANDARD);
                 approveSetupMap.put(t.getApproveSetup(), t.getApproveSetup());
-                if (Objects.nonNull(t.getApproveRemark())) {
-                    String[] strs = t.getApproveRemark().split(";");
-                    if (strs.length > 0) {
-                        t.setApproveRemark(strs[0]);
-                    }
+                if (Objects.nonNull(t.getApproveOperation())) {
+                    t.setApproveRemark(t.getApproveOperation().getTitle());
                 }
             }
         }

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBProjectExchangeServiceImpl.java

@@ -221,11 +221,8 @@ public class TBProjectExchangeServiceImpl extends ServiceImpl<TBProjectExchangeM
             for (TFFlowViewLogResult t : flowApproveHistoryList) {
                 t.setMessageType(FlowMsgTypeEnum.STANDARD);
                 approveSetupMap.put(t.getApproveSetup(), t.getApproveSetup());
-                if (Objects.nonNull(t.getApproveRemark())) {
-                    String[] strs = t.getApproveRemark().split(";");
-                    if (strs.length > 0) {
-                        t.setApproveRemark(strs[0]);
-                    }
+                if (Objects.nonNull(t.getApproveOperation())) {
+                    t.setApproveRemark(t.getApproveOperation().getTitle());
                 }
             }
         }