Bläddra i källkod

用户查询类表中添加岗位信息

buzhanyi 1 år sedan
förälder
incheckning
2346e01ce6

+ 2 - 2
application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/controller/SysUserController.java

@@ -191,8 +191,8 @@ public class SysUserController {
             PageMethod.startPage(sysUserDtoFilter.getPageNum(), sysUserDtoFilter.getPageSize());
         }
         SysUser sysUserFilter = MyModelUtil.copyTo(sysUserDtoFilter, SysUser.class);
-        List<SysUserVo> sysUserList = sysUserService.getSysUserListWithRelation(sysUserFilter);
-        return ResMsg.newInstance(CodeEnum.OK, MyPageUtil.makeResponseData(sysUserList));
+        List<SysUser> sysUserList = sysUserService.getSysUserListWithRelation(sysUserFilter);
+        return ResMsg.newInstance(CodeEnum.OK, MyPageUtil.makeResponseData(sysUserList, SysUser.INSTANCE));
     }
 
     /**

+ 1 - 1
application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/service/SysUserService.java

@@ -91,7 +91,7 @@ public interface SysUserService extends IBaseService<SysUser, String> {
      * @param filter 主表过滤对象。
      * @return 查询结果集。
      */
-    List<SysUserVo> getSysUserListWithRelation(SysUser filter);
+    List<SysUser> getSysUserListWithRelation(SysUser filter);
 
     /**
      * 获取指定角色的用户列表。

+ 8 - 14
application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/service/impl/SysUserServiceImpl.java

@@ -261,22 +261,16 @@ public class SysUserServiceImpl extends BaseService<SysUser, String> implements
      * @return 查询结果集。
      */
     @Override
-    public List<SysUserVo> getSysUserListWithRelation(SysUser filter) {
-        List<SysUser> list = sysUserMapper.getSysUserList(filter);
-        List<SysUserVo> resultList = new ArrayList<>();
+    public List<SysUser> getSysUserListWithRelation(SysUser filter) {
+        List<SysUser> resultList = sysUserMapper.getSysUserList(filter);
+        for (SysUser user : resultList) {
+            List<SysUserPost> userPostList = sysPostService.getSysUserPostListByUserId(user.getUserId());
+            user.setSysUserPostList(userPostList);
+        }
         // 在缺省生成的代码中,如果查询结果resultList不是Page对象,说明没有分页,那么就很可能是数据导出接口调用了当前方法。
         // 为了避免一次性的大量数据关联,规避因此而造成的系统运行性能冲击,这里手动进行了分批次读取,开发者可按需修改该值。
-        int batchSize = list instanceof Page ? 0 : 1000;
-        this.buildRelationForDataList(list, MyRelationParam.normal(), batchSize);
-        for (SysUser user : list) {
-            SysUserVo userVo = new SysUserVo();
-            BeanUtils.copyProperties(user, userVo);
-            userVo.setUserId(user.getUserId() + "");
-            userVo.setDeptId(user.getDeptId() + "");
-            userVo.setCreateUserId(user.getCreateUserId() + "");
-            userVo.setUpdateUserId(user.getUpdateUserId() + "");
-            resultList.add(userVo);
-        }
+        int batchSize = resultList instanceof Page ? 0 : 1000;
+        this.buildRelationForDataList(resultList, MyRelationParam.normal(), batchSize);
         return resultList;
     }