完善

platform-dao/src/main/resources/mapper/repair/RepairApplicationFormMapper.xml

@@ -4,8 +4,6 @@
     <sql id="Base_Column_List">
         application.*,
         user.real_name as userName,
-        user1.real_name as repairUserName,
-        user2.real_name as checkUserName,
         sb.name as sbName,part.name as partName,
         sb.no as sbNo, sb.cph as sbCph, sb.model_id as modelId,
         error.name as repairErrorTypeName
@@ -16,8 +14,6 @@
         <include refid="Base_Column_List"/>
         from t_repair_application_form application
         left join t_sys_user user on application.user_id = user.user_id
-        left join t_sys_user user1 on application.repair_user_id = user1.user_id
-        left join t_sys_user user2 on application.check_user_id = user2.user_id
         left join t_sb_info sb on application.sb_id = sb.id
         left join t_error_type error on application.repair_error_type_id = error.id
         left join t_part_info part on application.part_id = part.id
@@ -82,8 +78,6 @@
         <include refid="Base_Column_List"/>
         from t_repair_application_form application
         left join t_sys_user user on application.user_id = user.user_id
-        left join t_sys_user user1 on application.repair_user_id = user1.user_id
-        left join t_sys_user user2 on application.check_user_id = user2.user_id
         left join t_sb_info sb on application.sb_id = sb.id
         left join t_part_info part on application.part_id = part.id
         left join t_error_type error on application.repair_error_type_id = error.id

platform-service/src/main/java/com/platform/service/redis/impl/RedisTaskService.java

@@ -84,7 +84,7 @@ public class RedisTaskService extends KeyExpirationEventMessageListener {
         SbInfoVO sbInfoVO = sbInfoService.getById(repairApplicationForm.getSbId());
         SysUserVO userVO = null;
 
-        if(expiredKeyArr[0].equalsIgnoreCase(RedisKeyConstants.EXPIRE_BUSINESS_KEY_REPAIR_PREFIX)){
+        if(expiredKeyArr[0].contains(RedisKeyConstants.EXPIRE_BUSINESS_KEY_REPAIR_PREFIX)){
             if(!repairApplicationForm.getStatus().equals(RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue())){
                 return;
             }

platform-service/src/main/java/com/platform/service/repair/impl/RepairApplicationFormServiceImpl.java

@@ -191,18 +191,16 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
         Weekend<RepairApplicationForm> weekend = new Weekend<>(RepairApplicationForm.class);
         weekend.weekendCriteria().andIsNotNull(RepairApplicationForm::getId).andEqualTo(RepairApplicationForm::getType, model.getType());
         int count = mapper.selectCountByExample(weekend);
-       /* UserInfo userInfo = SecurityUtils.getUserInfo();
+        UserInfo userInfo = SecurityUtils.getUserInfo();
+
+        // 未登录
         if(userInfo != null){
             model.setUserId(userInfo.getUserId());
             if(StringUtils.isBlank(model.getActualUser())){
                 model.setActualUser(userInfo.getRealName());
             }
-        }*/
-        if(StringUtils.isBlank(model.getActualUser())){
-            UserInfo userInfo = SecurityUtils.getUserInfo();
-            model.setUserId(userInfo.getUserId());
-            model.setActualUser(userInfo.getRealName());
         }
+
         if(model.getSource() == null){
             model.setSource(1);
         }