用户昵称修改后无法改回来

tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java

@@ -348,6 +348,19 @@ public class ProTaskDetailService implements IProTaskDetailService {
 
         if (CollectionUtil.isNotEmpty(secondTaskVoList)) {
             for (TaskVo.NormalTask normalTask : secondTaskVoList) {
+
+                //通过角色id查找  负责人名称  检查人名称
+                Long executorRole = normalTask.getExecutorRole();
+                ProRole executor = proRoleDao.selectByPrimaryKey(executorRole);
+                if(ObjectUtil.isNotNull(executor)){
+                    normalTask.setExecutorRoleName(executor.getName());
+                }
+                Long checkerRole = normalTask.getCheckerRole();
+                ProRole checker = proRoleDao.selectByPrimaryKey(checkerRole);
+                if(ObjectUtil.isNotNull(checker)){
+                    normalTask.setCheckerRoleName(checker.getName());
+                }
+
                 //处理插件
                 managePlugin(currentUserId, roleId, normalTask, imitation);
                 //任务完成状态
@@ -420,11 +433,16 @@ public class ProTaskDetailService implements IProTaskDetailService {
 //                }
                 //通过角色id查找  负责人名称  检查人名称
                 Long executorRole = normalTask.getExecutorRole();
-                ProRole proRole = proRoleDao.selectByPrimaryKey(executorRole);
+                ProRole executor = proRoleDao.selectByPrimaryKey(executorRole);
-                normalTask.setExecutorRoleName(proRole.getName());
+                if(ObjectUtil.isNotNull(executor)){
+                    normalTask.setExecutorRoleName(executor.getName());
+                }
                 Long checkerRole = normalTask.getCheckerRole();
-                ProRole proRole1 = proRoleDao.selectByPrimaryKey(checkerRole);
+                ProRole checker = proRoleDao.selectByPrimaryKey(checkerRole);
-                normalTask.setCheckerRoleName(proRole1.getName());
+                if(ObjectUtil.isNotNull(checker)){
+                    normalTask.setCheckerRoleName(checker.getName());
+                }
+
 
                 //处理插件
                 managePlugin(currentUserId, roleId, normalTask, imitation);

tall/src/main/java/com/ccsens/tall/service/UserInfoService.java

@@ -126,6 +126,7 @@ public class UserInfoService implements IUserInfoService{
         sysUserExample.createCriteria().andNicknameEqualTo(updateNickname.getNickname());
         List<SysUser> userList = sysUserDao.selectByExample(sysUserExample);
         if(CollectionUtil.isNotEmpty(userList)){
+            redisUtil.del(nicknameKey);
             throw new BaseException(CodeEnum.NICKNAME_REPEAT);
         }
         SysUser user = sysUserDao.selectByPrimaryKey(userId);

tall/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: test
+    active: dev
-    include: util-test,common
+    include: util-dev,common