From 022b17044ab6bb284fd6313da91d1d1dfb2d5079 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 03 六月 2024 13:20:42 +0800
Subject: [PATCH] update

---
 assess-system/src/main/java/com/gkhy/assess/system/service/impl/AssPlanPersonServiceImpl.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/assess-system/src/main/java/com/gkhy/assess/system/service/impl/AssPlanPersonServiceImpl.java b/assess-system/src/main/java/com/gkhy/assess/system/service/impl/AssPlanPersonServiceImpl.java
index e641012..3d3f27b 100644
--- a/assess-system/src/main/java/com/gkhy/assess/system/service/impl/AssPlanPersonServiceImpl.java
+++ b/assess-system/src/main/java/com/gkhy/assess/system/service/impl/AssPlanPersonServiceImpl.java
@@ -6,9 +6,11 @@
 import com.gkhy.assess.common.exception.ApiException;
 import com.gkhy.assess.common.utils.StringUtils;
 import com.gkhy.assess.system.domain.AssPlanPerson;
+import com.gkhy.assess.system.domain.SysUser;
 import com.gkhy.assess.system.enums.PlayRoleEnum;
 import com.gkhy.assess.system.mapper.AssPlanPersonMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gkhy.assess.system.mapper.SysUserMapper;
 import com.gkhy.assess.system.service.AssPlanPersonService;
 import com.gkhy.assess.system.service.AssProjectService;
 import com.gkhy.assess.system.utils.ShiroUtils;
@@ -29,6 +31,8 @@
 public class AssPlanPersonServiceImpl extends ServiceImpl<AssPlanPersonMapper, AssPlanPerson> implements AssPlanPersonService {
     @Autowired
     private AssProjectService projectService;
+    @Autowired
+    private SysUserMapper sysUserMapper;
     @Override
     public List<AssPlanPerson> getByProjectId(Long projectId) {
         projectService.checkUserAllowed(projectId);
@@ -57,11 +61,15 @@
         AssPlanPerson pPerson= getOne(lambdaQueryWrapper);
         if(pPerson!=null){
             PlayRoleEnum playRoleEnum=PlayRoleEnum.getInfoByCode(pPerson.getPlayRole());
+            SysUser sysUser=sysUserMapper.selectById(planPerson.getPersonId());
+            if(sysUser==null){
+                throw new ApiException("选择的用户不存在");
+            }
             String message=playRoleEnum!=null?playRoleEnum.getInfo():"";
             if(StringUtils.isBlank(message)){
-                message="该用户已存在";
+                message=String.format("用户<%s>已担任职务",sysUser.getName());
             }else{
-                message="该用户已担任"+message;
+                message=String.format("用户<%s>已担任%s",sysUser.getName(),message);
             }
             throw new ApiException(message);
         }

--
Gitblit v1.9.2