From 6e2fc642d35e0c77f361058de45a7f2156bf436a Mon Sep 17 00:00:00 2001
From: bupengxiang <bupengxiang@syxysoft.com>
Date: Thu, 27 Apr 2023 18:02:30 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E5=8F=91=E8=B5=B7=E5=90=8E=20=E5=88=A0=E9=99=A4=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=20=E5=9B=9E=E6=98=BEbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/adc/da/sys/dao/mysql/UserEODao.java   |  3 ++
 .../adc/da/sys/service/UserEOServiceImpl.java | 10 ++++
 .../sys/service/iservice/IUserEoService.java  |  2 +
 .../mybatis/mapper/sys/mysql/UserEOMapper.xml | 49 +++++++++++++++++++
 .../task/TaskController.java                  |  4 +-
 5 files changed, 66 insertions(+), 2 deletions(-)

diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/UserEODao.java b/adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/UserEODao.java
index c9932ad..03fab73 100644
--- a/adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/UserEODao.java
+++ b/adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/UserEODao.java
@@ -33,6 +33,7 @@ public interface UserEODao extends BaseMapper<UserEO> {
 
     List<UserVO> getUserByIdList(@Param("userIdList") List<String> userIdList);
 
+    List<UserVO> getUserByIdListNodel(@Param("userIdList") List<String> userIdList);
     // 根据account获取未逻辑删除的UserEO
     UserEO getUserEOByAccountNotDeleted(String account);
 
@@ -41,4 +42,6 @@ public interface UserEODao extends BaseMapper<UserEO> {
     List<Map<String, Object>> allList( @Param("account") String account, @Param("roleName") String roleName);
 
     UserEO getUserEoById(@Param("usid") String usid);
+
+    UserEO selectUserByIdNodel(String userId);
 }
diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java
index d589317..32e0bd0 100644
--- a/adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java
+++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java
@@ -144,6 +144,11 @@ public class UserEOServiceImpl implements IUserEoService {
         return dao.getUserByIdList(userIdList);
     }
 
+    @Override
+    public List<UserVO> getUserByIdListNodel(List<String> userIdList){
+        return dao.getUserByIdListNodel(userIdList);
+    }
+
     @Override
     public IPage<Map<String, Object>> list(int pageNo, int pageSize, String account, String roleName) {
         IPage page = new Page();
@@ -271,6 +276,11 @@ public class UserEOServiceImpl implements IUserEoService {
         return dao.allList(account,roleName);
     }
 
+    @Override
+    public UserEO getUserByIdNodel(String userId) {
+        return dao.selectUserByIdNodel(userId);
+    }
+
     void checkExcel(List<UserImportVO> list) {
         if (CollectionUtils.isEmpty(list)) {
             throw new AdcDaBaseException("数据不能为空");
diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/iservice/IUserEoService.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/iservice/IUserEoService.java
index 8ad346f..1262ab6 100644
--- a/adc-da-sys/src/main/java/com/adc/da/sys/service/iservice/IUserEoService.java
+++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/iservice/IUserEoService.java
@@ -42,6 +42,7 @@ public interface IUserEoService {
     UserEO getUserEoById(String usid);
 
     List<UserVO> getUserByIdList(List<String> userIdList);
+    List<UserVO> getUserByIdListNodel(List<String> userIdList);
 
     IPage<Map<String, Object>> list(int pageNo, int pageSize, String account, String roleName);
 
@@ -57,4 +58,5 @@ public interface IUserEoService {
 
     List<Map<String, Object>> allList(String account, String roleName);
 
+    UserEO getUserByIdNodel(String userId);
 }
diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml
index efb3ee0..0cd18df 100644
--- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml
+++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml
@@ -186,6 +186,55 @@
         where users.del_flag != 1
         and  users.usid=#{usid}
     </select>
+    <select id="selectUserByIdNodel" resultType="com.adc.da.sys.entity.UserEO">
+        select
+            users.usid,
+            users.usname,
+            users.account,
+            r.id as r_id,
+            r.data_scope as r_data_scope,
+            r.del_flag as r_delFlag,
+            r.is_default as r_is_default,
+            r.name as r_name,
+            o.id as o_id,
+            o.org_code as o_org_code,
+            o.org_name as o_org_name,
+            o.sup_org_code as o_sup_org_code,
+            o.bmdm_14 as o_bmdm14
+        from TS_USER users
+                 left join TR_USER_ROLE ur on users.usid = ur.user_id
+                 left join TS_ROLE r on ur.role_id = r.id
+                 left join TR_USER_ORG uo on users.usid = uo.user_id
+                 left join TS_ORG o on uo.org_id = o.id
+        where  users.usid=#{usid}
+    </select>
+
+    <select id="getUserByIdListNodel" resultType="com.adc.da.sys.vo.UserVO">
+
+        select
+        users.usid,
+        users.usname,
+        users.account,
+        r.id as r_id,
+        r.data_scope as r_data_scope,
+        r.del_flag as r_delFlag,
+        r.is_default as r_is_default,
+        r.name as r_name,
+        o.id as o_id,
+        o.org_code as o_org_code,
+        o.org_name as o_org_name,
+        o.sup_org_code as o_sup_org_code,
+        o.bmdm_14 as o_bmdm14
+        from TS_USER users
+        left join TR_USER_ROLE ur on users.usid = ur.user_id
+        left join TS_ROLE r on ur.role_id = r.id
+        left join TR_USER_ORG uo on users.usid = uo.user_id
+        left join TS_ORG o on uo.org_id = o.id
+        where users.usid in
+        <foreach collection="userIdList" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </select>
 
 
 </mapper>
diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TaskController.java b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TaskController.java
index c718409..0dfc08e 100644
--- a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TaskController.java
+++ b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TaskController.java
@@ -83,7 +83,7 @@ public class TaskController {
 				BusProcessNew processNew = iBusProcessNewService.getOne(processNewQueryWrapper);
 
 				if(processNew!=null){
-					UserEO assignee = userEoService.getUserById(processNew.getUserId());
+					UserEO assignee = userEoService.getUserByIdNodel(processNew.getUserId());
 					if(assignee != null){
 						historicTaskInstance.put("assignee", assignee.getUsname());
 						historicTaskInstance.put("assigneeId", assignee.getUsid());
@@ -91,7 +91,7 @@ public class TaskController {
 				}
 			}else{
 				String assigneeId = historicTaskInstance.get("assignee").toString();
-				List<UserVO> userByIdList = userEoService.getUserByIdList(Arrays.asList(assigneeId));
+				List<UserVO> userByIdList = userEoService.getUserByIdListNodel(Arrays.asList(assigneeId));
 				if(userByIdList.size()>0){
 					UserVO assignee = userByIdList.get(0);
 					historicTaskInstance.put("assignee", assignee.getUsname());