From 39580d174a58fefc4447cda84614354e621f8ac3 Mon Sep 17 00:00:00 2001
From: hyy-alt <1041001226@qq.com>
Date: Mon, 26 Apr 2021 16:07:29 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=98=B5=E7=A7=B0=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=90=8E=E6=97=A0=E6=B3=95=E6=94=B9=E5=9B=9E=E6=9D=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tall/service/ProTaskDetailService.java    | 26 ++++++++++++++++---
 .../ccsens/tall/service/UserInfoService.java  |  1 +
 tall/src/main/resources/application.yml       |  4 +--
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java b/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java
index aba905a0..6b0e682e 100644
--- a/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java
+++ b/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);
-                normalTask.setExecutorRoleName(proRole.getName());
+                ProRole executor = proRoleDao.selectByPrimaryKey(executorRole);
+                if(ObjectUtil.isNotNull(executor)){
+                    normalTask.setExecutorRoleName(executor.getName());
+                }
                 Long checkerRole = normalTask.getCheckerRole();
-                ProRole proRole1 = proRoleDao.selectByPrimaryKey(checkerRole);
-                normalTask.setCheckerRoleName(proRole1.getName());
+                ProRole checker = proRoleDao.selectByPrimaryKey(checkerRole);
+                if(ObjectUtil.isNotNull(checker)){
+                    normalTask.setCheckerRoleName(checker.getName());
+                }
+
 
                 //处理插件
                 managePlugin(currentUserId, roleId, normalTask, imitation);
diff --git a/tall/src/main/java/com/ccsens/tall/service/UserInfoService.java b/tall/src/main/java/com/ccsens/tall/service/UserInfoService.java
index dda619fb..61855606 100644
--- a/tall/src/main/java/com/ccsens/tall/service/UserInfoService.java
+++ b/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);
diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml
index ebc544af..b5408a3a 100644
--- a/tall/src/main/resources/application.yml
+++ b/tall/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: test
-    include: util-test,common
+    active: dev
+    include: util-dev,common