[修改] 流程发起后 删除用户 回显bug

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);
 }

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("数据不能为空");

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);
 }

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>

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());