[修改] 修改 转办 与审批历史

adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java

@@ -13,6 +13,7 @@ import com.adc.da.sys.vo.UserImportVO;
 import com.adc.da.sys.vo.UserVO;
 import com.adc.da.util.http.ResponseMessage;
 import com.adc.da.util.http.Result;
+import com.adc.da.util.utils.CollectionUtils;
 import com.adc.da.util.utils.FileUtil;
 import com.adc.da.util.utils.StringUtils;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -36,6 +37,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -224,7 +226,10 @@ public class UserEOController extends BaseController<UserEO> {
     public ResponseMessage getOwnLeader(String userId){
         UserVO userEoById = userEOService.getUserEoById(userId);
         List<OrgEO> orgEOList = userEoById.getOrgEOList();
-        List<UserEO> leaderList = userEOService.getOwnLeader(orgEOList);
+        List<UserEO> leaderList = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(orgEOList)){
+            leaderList  = userEOService.getOwnLeader(orgEOList);
+        }
         return Result.success(leaderList);
     }
 }

adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/UserEODao.java

@@ -44,7 +44,7 @@ public interface UserEODao extends BaseMapper<UserEO> {
 
     UserVO getUserEoById(@Param("usid") String usid);
 
-    UserEO selectUserByIdNodel(String userId);
+    UserVO selectUserByIdNodel(String userId);
 
     List<UserEO> getOwnLeader(@Param("Vo") List<OrgEO> orgEOList);
 }

adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java

@@ -328,7 +328,7 @@ public class UserEOServiceImpl implements IUserEoService {
     }
 
     @Override
-    public UserEO getUserByIdNodel(String userId) {
+    public UserVO getUserByIdNodel(String userId) {
         return dao.selectUserByIdNodel(userId);
     }
 

adc-da-sys/src/main/java/com/adc/da/sys/service/iservice/IUserEoService.java

@@ -67,7 +67,7 @@ public interface IUserEoService {
      * @param userId
      * @return
      */
-    UserEO getUserByIdNodel(String userId);
+    UserVO getUserByIdNodel(String userId);
 
     List<UserEO> getOwnLeader(List<OrgEO> orgEOList);
 }

adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml

@@ -207,7 +207,7 @@
         where users.del_flag != 1
         and  users.usid=#{usid}
     </select>
-    <select id="selectUserByIdNodel" resultType="com.adc.da.sys.entity.UserEO">
+    <select id="selectUserByIdNodel" resultMap="UserDetailMap">
         select
             users.usid,
             users.usname,
@@ -230,7 +230,7 @@
         where  users.usid=#{usid}
     </select>
 
-    <select id="getUserByIdListNodel" resultType="com.adc.da.sys.vo.UserVO">
+    <select id="getUserByIdListNodel" resultMap="UserDetailMap">
 
         select
         users.usid,