diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectorg/InspectOrgService.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectorg/InspectOrgService.java index 539fd63..5ea4ec6 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectorg/InspectOrgService.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectorg/InspectOrgService.java @@ -6,6 +6,8 @@ import cn.iocoder.yudao.module.inspect.dal.dataobject.inspectorg.InspectOrgDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * tb_org Service 接口 @@ -51,5 +53,12 @@ public interface InspectOrgService { * @return tb_org分页 */ PageResult getInspectOrgPage(InspectOrgPageReqVO pageReqVO); - + + /** + * 获取机构信息列表 + * + * @param ids 机构ID集合 + * @return 机构信息列表 + */ + List getOrgList(Collection ids); } \ No newline at end of file diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectorg/InspectOrgServiceImpl.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectorg/InspectOrgServiceImpl.java index 520b4b8..0bb0e66 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectorg/InspectOrgServiceImpl.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectorg/InspectOrgServiceImpl.java @@ -17,6 +17,8 @@ import javax.annotation.Resource; import java.util.List; import java.util.Objects; +import java.util.Collection; +import java.util.Collections; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.yudao.module.tb.enums.ErrorCodeConstants.*; @@ -127,4 +129,12 @@ public class InspectOrgServiceImpl implements InspectOrgService { return inspectOrgMapper.selectPage(pageReqVO); } + @Override + public List getOrgList(Collection ids) { + if (ids == null || ids.isEmpty()) { + return Collections.emptyList(); + } + return inspectOrgMapper.selectBatchIds(ids); + } + } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java index e0da587..361f877 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java @@ -8,8 +8,8 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; -import cn.iocoder.yudao.module.inspect.dal.dataobject.inspectdepartment.InspectDepartmentDO; -import cn.iocoder.yudao.module.inspect.service.inspectdepartment.InspectDepartmentService; +import cn.iocoder.yudao.module.inspect.dal.dataobject.inspectorg.InspectOrgDO; +import cn.iocoder.yudao.module.inspect.service.inspectorg.InspectOrgService; import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.*; import cn.iocoder.yudao.module.system.convert.user.UserConvert; import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO; @@ -49,7 +49,8 @@ public class UserController { @Resource private DeptService deptService; @Resource - private InspectDepartmentService departmentService; + private InspectOrgService orgService; + @PostMapping("/create") @Operation(summary = "新增用户") @PreAuthorize("@ss.hasPermission('system:user:create')") @@ -100,14 +101,11 @@ public class UserController { if (CollUtil.isEmpty(pageResult.getList())) { return success(new PageResult<>(pageResult.getTotal())); } - // 拼接自己的科室数据 - List list = departmentService.getDeptList(convertList(pageResult.getList(), AdminUserDO::getDeptId)); - Map deptMap = CollectionUtils.convertMap(list, InspectDepartmentDO::getDepartmentCode); + // 拼接机构数据 + List list = orgService.getOrgList(convertList(pageResult.getList(), AdminUserDO::getDeptId)); + Map orgMap = CollectionUtils.convertMap(list, InspectOrgDO::getOrgid); - // 框架原本的拼接数据 -// Map deptMap = deptService.getDeptMap( -// convertList(pageResult.getList(), AdminUserDO::getDeptId)); - return success(new PageResult<>(UserConvert.INSTANCE.convertdeptList(pageResult.getList(), deptMap), + return success(new PageResult<>(UserConvert.INSTANCE.convertOrgList(pageResult.getList(), orgMap), pageResult.getTotal())); } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/user/UserConvert.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/user/UserConvert.java index a20a8a4..f86e724 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/user/UserConvert.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/user/UserConvert.java @@ -4,6 +4,7 @@ import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; import cn.iocoder.yudao.framework.common.util.collection.MapUtils; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.inspect.dal.dataobject.inspectdepartment.InspectDepartmentDO; +import cn.iocoder.yudao.module.inspect.dal.dataobject.inspectorg.InspectOrgDO; import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptSimpleRespVO; import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.PostSimpleRespVO; import cn.iocoder.yudao.module.system.controller.admin.permission.vo.role.RoleSimpleRespVO; @@ -32,6 +33,9 @@ public interface UserConvert { default List convertdeptList(List list, Map deptMap) { return CollectionUtils.convertList(list, user -> convertdept(user, deptMap.get(String.valueOf(user.getDeptId())))); } + default List convertOrgList(List list, Map orgMap) { + return CollectionUtils.convertList(list, user -> convertOrg(user, orgMap.get(user.getDeptId()))); + } default UserRespVO convert(AdminUserDO user, DeptDO dept) { UserRespVO userVO = BeanUtils.toBean(user, UserRespVO.class); if (dept != null) { @@ -46,8 +50,13 @@ public interface UserConvert { } return userVO; } - - + default UserRespVO convertOrg(AdminUserDO user, InspectOrgDO org) { + UserRespVO userVO = BeanUtils.toBean(user, UserRespVO.class); + if (org != null) { + userVO.setDeptName(org.getOrgName()); + } + return userVO; + } default List convertSimpleList(List list, Map deptMap) { return CollectionUtils.convertList(list, user -> {