From 56589b1303e3e05b6f87da8741fda68a66beef3d Mon Sep 17 00:00:00 2001 From: zhuxinru Date: Fri, 10 Apr 2026 13:57:45 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BA=8B=E4=B8=9A=E9=83=A8=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=96=B0=E5=A2=9E=E5=AD=A6=E7=A7=91=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9&=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=AF=A6=E7=BB=86=E4=BF=A1=E6=81=AF=EF=BC=88?= =?UTF-8?q?=E5=B8=A6=E9=83=A8=E9=97=A8=E8=A7=92=E8=89=B2=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 1-sql/2026-04-10/sys_dept_user.sql | 2 +- .../entity/req/system/DeptQueryReq.java | 2 +- .../entity/req/system/UserQueryReq.java | 3 +- .../entity/resp/system/SysDeptUserResp.java | 2 +- .../impl/system/SysDeptFeignClientImpl.java | 8 ++-- .../inter/system/ISysDeptFeignClient.java | 4 +- .../system/controller/SysDeptController.java | 6 +-- .../system/controller/SysUserController.java | 12 +++-- .../sdm/system/model/entity/SysDeptUser.java | 4 +- .../system/model/req/dept/DeptOperateReq.java | 2 +- .../model/req/user/SaveUserRelationReq.java | 7 ++- .../system/service/ISysDeptUserService.java | 2 +- .../service/ISysUserRelationService.java | 2 +- .../sdm/system/service/ISysUserService.java | 2 + .../impl/CID/CIDISysUserServiceImpl.java | 22 +++++++++ .../service/impl/ISysDeptUserServiceImpl.java | 20 ++++---- .../service/impl/LocalUserServiceImpl.java | 5 ++ .../impl/SysUserRelationServiceImpl.java | 46 ++++++++++--------- .../main/resources/application-dev-100.yml | 1 + .../main/resources/application-dev-190.yml | 1 + .../src/main/resources/application-dev-65.yml | 1 + .../src/main/resources/application-local.yml | 1 + .../src/main/resources/application-lyric.yml | 1 + .../src/main/resources/application-yian.yml | 1 + 24 files changed, 100 insertions(+), 57 deletions(-) diff --git a/1-sql/2026-04-10/sys_dept_user.sql b/1-sql/2026-04-10/sys_dept_user.sql index 5b59153f..8e003049 100644 --- a/1-sql/2026-04-10/sys_dept_user.sql +++ b/1-sql/2026-04-10/sys_dept_user.sql @@ -1,2 +1,2 @@ ALTER TABLE `sys_dept_user` ADD COLUMN `subject` varchar(255) DEFAULT NULL COMMENT '学科' AFTER `deptName`; -ALTER TABLE `sys_dept_user` ADD COLUMN `stage` varchar(255) DEFAULT NULL COMMENT '阶段' AFTER `subject`; \ No newline at end of file +ALTER TABLE `sys_dept_user` ADD COLUMN `stage` varchar(255) DEFAULT NULL COMMENT '阶段' AFTER `discipline`; \ No newline at end of file diff --git a/common/src/main/java/com/sdm/common/entity/req/system/DeptQueryReq.java b/common/src/main/java/com/sdm/common/entity/req/system/DeptQueryReq.java index ea0dcdbe..33d163b0 100644 --- a/common/src/main/java/com/sdm/common/entity/req/system/DeptQueryReq.java +++ b/common/src/main/java/com/sdm/common/entity/req/system/DeptQueryReq.java @@ -11,6 +11,6 @@ public class DeptQueryReq extends BaseReq { private String deptName; @Schema(description = "学科") - private String subject; + private String discipline; } diff --git a/common/src/main/java/com/sdm/common/entity/req/system/UserQueryReq.java b/common/src/main/java/com/sdm/common/entity/req/system/UserQueryReq.java index 57b71b70..17f7e5f7 100644 --- a/common/src/main/java/com/sdm/common/entity/req/system/UserQueryReq.java +++ b/common/src/main/java/com/sdm/common/entity/req/system/UserQueryReq.java @@ -1,5 +1,6 @@ package com.sdm.common.entity.req.system; +import com.sdm.common.entity.BaseReq; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; @@ -15,7 +16,7 @@ import java.util.List; @Builder @NoArgsConstructor @AllArgsConstructor -public class UserQueryReq { +public class UserQueryReq extends BaseReq { @Schema(description = "用户ID") @NotNull(message = "用户ID不能为空") private Long userId; diff --git a/common/src/main/java/com/sdm/common/entity/resp/system/SysDeptUserResp.java b/common/src/main/java/com/sdm/common/entity/resp/system/SysDeptUserResp.java index f4c5bece..2a5044b0 100644 --- a/common/src/main/java/com/sdm/common/entity/resp/system/SysDeptUserResp.java +++ b/common/src/main/java/com/sdm/common/entity/resp/system/SysDeptUserResp.java @@ -20,7 +20,7 @@ public class SysDeptUserResp { private String deptName; @Schema(description = "学科") - private String subject; + private String discipline; @Schema(description = "阶段") private String stage; diff --git a/common/src/main/java/com/sdm/common/feign/impl/system/SysDeptFeignClientImpl.java b/common/src/main/java/com/sdm/common/feign/impl/system/SysDeptFeignClientImpl.java index 6267db10..41fc883a 100644 --- a/common/src/main/java/com/sdm/common/feign/impl/system/SysDeptFeignClientImpl.java +++ b/common/src/main/java/com/sdm/common/feign/impl/system/SysDeptFeignClientImpl.java @@ -40,16 +40,16 @@ public class SysDeptFeignClientImpl implements ISysDeptFeignClient { } @Override - public SdmResponse> queryByDeptAndSubject(DeptQueryReq req) { + public SdmResponse> queryByDeptAndDiscipline(DeptQueryReq req) { SdmResponse> response = null; try { - response = sysDeptFeignClient.queryByDeptAndSubject(req); + response = sysDeptFeignClient.queryByDeptAndDiscipline(req); if (response == null || !response.isSuccess()) { - log.error("queryByDeptAndSubject failed response:{}", JSONObject.toJSONString(Optional.ofNullable(response))); + log.error("queryByDeptAndDiscipline failed response:{}", JSONObject.toJSONString(Optional.ofNullable(response))); return SdmResponse.failed("根据部门和学科查询负责人失败"); } } catch (Exception e) { - log.error("queryByDeptAndSubject error response:{}", JSONObject.toJSONString(Optional.ofNullable(response))); + log.error("queryByDeptAndDiscipline error response:{}", JSONObject.toJSONString(Optional.ofNullable(response))); return SdmResponse.failed("根据部门和学科查询负责人失败"); } return response; diff --git a/common/src/main/java/com/sdm/common/feign/inter/system/ISysDeptFeignClient.java b/common/src/main/java/com/sdm/common/feign/inter/system/ISysDeptFeignClient.java index efc47c05..8f6c919f 100644 --- a/common/src/main/java/com/sdm/common/feign/inter/system/ISysDeptFeignClient.java +++ b/common/src/main/java/com/sdm/common/feign/inter/system/ISysDeptFeignClient.java @@ -17,7 +17,7 @@ public interface ISysDeptFeignClient { @GetMapping("/dept/listDept") SdmResponse>> listDept(@SpringQueryMap DeptQueryReq req); - @GetMapping("/dept/queryByDeptAndSubject") - SdmResponse> queryByDeptAndSubject(@SpringQueryMap DeptQueryReq req); + @GetMapping("/dept/queryByDeptAndDiscipline") + SdmResponse> queryByDeptAndDiscipline(@SpringQueryMap DeptQueryReq req); } diff --git a/system/src/main/java/com/sdm/system/controller/SysDeptController.java b/system/src/main/java/com/sdm/system/controller/SysDeptController.java index 46601853..373aae79 100644 --- a/system/src/main/java/com/sdm/system/controller/SysDeptController.java +++ b/system/src/main/java/com/sdm/system/controller/SysDeptController.java @@ -49,9 +49,9 @@ public class SysDeptController implements ISysDeptFeignClient { } @Operation(summary = "根据部门和学科查询负责人", description = "根据部门和学科查询负责人") - @GetMapping("/queryByDeptAndSubject") - public SdmResponse> queryByDeptAndSubject(@SpringQueryMap DeptQueryReq req) { - return deptUserService.queryByDeptAndSubject(req); + @GetMapping("/queryByDeptAndDiscipline") + public SdmResponse> queryByDeptAndDiscipline(@SpringQueryMap DeptQueryReq req) { + return deptUserService.queryByDeptAndDiscipline(req); } } \ No newline at end of file diff --git a/system/src/main/java/com/sdm/system/controller/SysUserController.java b/system/src/main/java/com/sdm/system/controller/SysUserController.java index a60e2ace..1894498c 100644 --- a/system/src/main/java/com/sdm/system/controller/SysUserController.java +++ b/system/src/main/java/com/sdm/system/controller/SysUserController.java @@ -276,18 +276,24 @@ public class SysUserController implements ISysUserFeignClient { return ISysUserService.listUserDetailByIds(req); } + @Operation(summary = "分页查询用户列表详细信息（带角色岗位）") + @PostMapping("/listUserDetailPage") + public SdmResponse>> listUserDetailPage(@Parameter(description = "用户查询请求参数") @RequestBody UserQueryReq req) { + return ISysUserService.listUserDetailPage(req); + } + @Operation(summary = "保存用户关系", description = "保存用户关系，覆盖式更新（先删后增）") @PostMapping("/saveUserRelation") public SdmResponse saveUserRelation(@Parameter(description = "保存用户关系请求参数") @RequestBody @Validated SaveUserRelationReq req) { return sysUserRelationService.saveUserRelation(req); } - @Operation(summary = "查询关联用户ID列表", description = "查询当前用户的关联用户列表，若无关联则返回自身ID") + @Operation(summary = "查询关联用户ID列表", description = "查询多个负责人的关联下属用户列表，去重合并返回，若无关联则返回传入的用户ID") @GetMapping("/queryRelatedUserIds") public SdmResponse> queryRelatedUserIds( - @Parameter(description = "用户ID") @RequestParam("userId") Long userId, + @Parameter(description = "用户ID列表，多个用逗号分隔") @RequestParam("userIds") List userIds, @Parameter(description = "关系类型，默认1-负责人与下属") @RequestParam(value = "relationType", required = false) Integer relationType) { - return sysUserRelationService.queryRelatedUserIds(userId, relationType); + return sysUserRelationService.queryRelatedUserIds(userIds, relationType); } } \ No newline at end of file diff --git a/system/src/main/java/com/sdm/system/model/entity/SysDeptUser.java b/system/src/main/java/com/sdm/system/model/entity/SysDeptUser.java index 5da786b8..f14fcce2 100644 --- a/system/src/main/java/com/sdm/system/model/entity/SysDeptUser.java +++ b/system/src/main/java/com/sdm/system/model/entity/SysDeptUser.java @@ -37,8 +37,8 @@ public class SysDeptUser implements Serializable { private String deptName; @Schema(description = "学科") - @TableField("subject") - private String subject; + @TableField("discipline") + private String discipline; @Schema(description = "阶段") @TableField("stage") diff --git a/system/src/main/java/com/sdm/system/model/req/dept/DeptOperateReq.java b/system/src/main/java/com/sdm/system/model/req/dept/DeptOperateReq.java index 5817dedb..1bba1a5e 100644 --- a/system/src/main/java/com/sdm/system/model/req/dept/DeptOperateReq.java +++ b/system/src/main/java/com/sdm/system/model/req/dept/DeptOperateReq.java @@ -16,7 +16,7 @@ public class DeptOperateReq { private Long deptId; @Schema(description = "学科") - private String subject; + private String discipline; @Schema(description = "阶段") private String stage; diff --git a/system/src/main/java/com/sdm/system/model/req/user/SaveUserRelationReq.java b/system/src/main/java/com/sdm/system/model/req/user/SaveUserRelationReq.java index a743f253..ddf46a51 100644 --- a/system/src/main/java/com/sdm/system/model/req/user/SaveUserRelationReq.java +++ b/system/src/main/java/com/sdm/system/model/req/user/SaveUserRelationReq.java @@ -2,7 +2,6 @@ package com.sdm.system.model.req.user; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; import lombok.Data; import java.util.List; @@ -11,9 +10,9 @@ import java.util.List; @Data public class SaveUserRelationReq { - @Schema(description = "主动方用户ID（负责人）", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "userId不能为空") - private Long userId; + @Schema(description = "主动方用户ID列表（多个负责人）", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "userIds不能为空") + private List userIds; @Schema(description = "被动方用户ID列表（下属）", requiredMode = Schema.RequiredMode.REQUIRED) @NotEmpty(message = "relatedUserIds不能为空") diff --git a/system/src/main/java/com/sdm/system/service/ISysDeptUserService.java b/system/src/main/java/com/sdm/system/service/ISysDeptUserService.java index ffb37602..0498a20b 100644 --- a/system/src/main/java/com/sdm/system/service/ISysDeptUserService.java +++ b/system/src/main/java/com/sdm/system/service/ISysDeptUserService.java @@ -20,6 +20,6 @@ public interface ISysDeptUserService extends IService { SdmResponse>> listDept(DeptQueryReq req); - SdmResponse> queryByDeptAndSubject(DeptQueryReq req); + SdmResponse> queryByDeptAndDiscipline(DeptQueryReq req); } diff --git a/system/src/main/java/com/sdm/system/service/ISysUserRelationService.java b/system/src/main/java/com/sdm/system/service/ISysUserRelationService.java index d3e818c9..03f7f2f7 100644 --- a/system/src/main/java/com/sdm/system/service/ISysUserRelationService.java +++ b/system/src/main/java/com/sdm/system/service/ISysUserRelationService.java @@ -11,5 +11,5 @@ public interface ISysUserRelationService extends IService { SdmResponse saveUserRelation(SaveUserRelationReq req); - SdmResponse> queryRelatedUserIds(Long userId, Integer relationType); + SdmResponse> queryRelatedUserIds(List userIds, Integer relationType); } diff --git a/system/src/main/java/com/sdm/system/service/ISysUserService.java b/system/src/main/java/com/sdm/system/service/ISysUserService.java index 4f62f8c9..fd36030e 100644 --- a/system/src/main/java/com/sdm/system/service/ISysUserService.java +++ b/system/src/main/java/com/sdm/system/service/ISysUserService.java @@ -55,4 +55,6 @@ public interface ISysUserService extends IService { SdmResponse> listUserDetailByIds(UserQueryReq req); + SdmResponse>> listUserDetailPage(UserQueryReq req); + } diff --git a/system/src/main/java/com/sdm/system/service/impl/CID/CIDISysUserServiceImpl.java b/system/src/main/java/com/sdm/system/service/impl/CID/CIDISysUserServiceImpl.java index 7417ef68..9725297e 100644 --- a/system/src/main/java/com/sdm/system/service/impl/CID/CIDISysUserServiceImpl.java +++ b/system/src/main/java/com/sdm/system/service/impl/CID/CIDISysUserServiceImpl.java @@ -47,6 +47,9 @@ public class CIDISysUserServiceImpl extends ServiceImpl @Value("${cid.user.listUserDetailByIds}") private String listUserDetailByIds; + @Value("${cid.user.listUserDetailPage}") + private String listUserDetailPage; + @Value("${cid.user.queryUserRole}") private String queryUserRole; @@ -315,6 +318,7 @@ public class CIDISysUserServiceImpl extends ServiceImpl @Override public SdmResponse> listUserDetailByIds(UserQueryReq req) { try { + req.setTenantId(ThreadLocalContext.getTenantId()); log.info("[CIDISysUserServiceImpl] listUserDetailByIds send url:{}, param:{}", cidUrl + listUserDetailByIds, JSONUtil.toJsonStr(req)); String userJson = HttpUtil.post(cidUrl + listUserDetailByIds, JSONUtil.toJsonStr(req)); log.info("[CIDISysUserServiceImpl] listUserDetailByIds response:{}", userJson); @@ -331,4 +335,22 @@ public class CIDISysUserServiceImpl extends ServiceImpl return SdmResponse.failed("查询用户失败: "); } } + + @Override + public SdmResponse>> listUserDetailPage(UserQueryReq req) { + try { + req.setTenantId(ThreadLocalContext.getTenantId()); + log.info("[CIDISysUserServiceImpl] listUserDetailPage send url:{}, param:{}", cidUrl + listUserDetailPage, JSONUtil.toJsonStr(req)); + String userJson = HttpUtil.post(cidUrl + listUserDetailPage, JSONUtil.toJsonStr(req)); + log.info("[CIDISysUserServiceImpl] listUserDetailPage response:{}", userJson); + SdmResponse>> result = JSON.parseObject(userJson, new TypeReference>>>() {}); + if (result != null) { + return result; + } + return SdmResponse.failed("用户不存在"); + } catch (Exception e) { + log.error("查询用户失败", e); + return SdmResponse.failed("查询用户失败: "); + } + } } diff --git a/system/src/main/java/com/sdm/system/service/impl/ISysDeptUserServiceImpl.java b/system/src/main/java/com/sdm/system/service/impl/ISysDeptUserServiceImpl.java index a9ab5897..e9e5d823 100644 --- a/system/src/main/java/com/sdm/system/service/impl/ISysDeptUserServiceImpl.java +++ b/system/src/main/java/com/sdm/system/service/impl/ISysDeptUserServiceImpl.java @@ -36,7 +36,7 @@ public class ISysDeptUserServiceImpl extends ServiceImpl sysDeptUsers = this.list(queryWrapper); if (CollectionUtils.isEmpty(sysDeptUsers)) { @@ -120,14 +120,14 @@ public class ISysDeptUserServiceImpl extends ServiceImpl> queryByDeptAndSubject(DeptQueryReq req) { + public SdmResponse> queryByDeptAndDiscipline(DeptQueryReq req) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(SysDeptUser::getTenantId, ThreadLocalContext.getTenantId()); if (StringUtils.isNotEmpty(req.getDeptName())) { queryWrapper.like(SysDeptUser::getDeptName, req.getDeptName()); } - if (StringUtils.isNotEmpty(req.getSubject())) { - queryWrapper.like(SysDeptUser::getSubject, req.getSubject()); + if (StringUtils.isNotEmpty(req.getDiscipline())) { + queryWrapper.like(SysDeptUser::getDiscipline, req.getDiscipline()); } List sysDeptUsers = this.list(queryWrapper); if (CollectionUtils.isEmpty(sysDeptUsers)) { @@ -192,7 +192,7 @@ public class ISysDeptUserServiceImpl extends ServiceImpl existingList = this.list(wrapper); for (SysDeptUser existing : existingList) { String existDeptName = normalizeString(existing.getDeptName()); - String existSubject = normalizeString(existing.getSubject()); + String existSubject = normalizeString(existing.getDiscipline()); String existStage = normalizeString(existing.getStage()); if (normalizedDeptName.equals(existDeptName) && normalizedSubject.equals(existSubject) diff --git a/system/src/main/java/com/sdm/system/service/impl/LocalUserServiceImpl.java b/system/src/main/java/com/sdm/system/service/impl/LocalUserServiceImpl.java index ecacbdef..c22c3acb 100644 --- a/system/src/main/java/com/sdm/system/service/impl/LocalUserServiceImpl.java +++ b/system/src/main/java/com/sdm/system/service/impl/LocalUserServiceImpl.java @@ -314,4 +314,9 @@ public class LocalUserServiceImpl extends ServiceImpl im return null; } + @Override + public SdmResponse>> listUserDetailPage(UserQueryReq req) { + return null; + } + } diff --git a/system/src/main/java/com/sdm/system/service/impl/SysUserRelationServiceImpl.java b/system/src/main/java/com/sdm/system/service/impl/SysUserRelationServiceImpl.java index 3a88bc46..c649fa77 100644 --- a/system/src/main/java/com/sdm/system/service/impl/SysUserRelationServiceImpl.java +++ b/system/src/main/java/com/sdm/system/service/impl/SysUserRelationServiceImpl.java @@ -13,8 +13,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; -import java.util.Collections; -import java.util.List; +import java.util.*; import java.util.stream.Collectors; @Service @@ -24,52 +23,55 @@ public class SysUserRelationServiceImpl extends ServiceImpl userIds = req.getUserIds(); Integer relationType = req.getRelationType(); - // 先删除该用户该类型的所有旧关系 + // 先删除这些用户该类型的所有旧关系 LambdaQueryWrapper deleteWrapper = new LambdaQueryWrapper<>(); - deleteWrapper.eq(SysUserRelation::getUserId, userId) + deleteWrapper.in(SysUserRelation::getUserId, userIds) .eq(SysUserRelation::getRelationType, relationType); remove(deleteWrapper); - // 批量插入新关系 - List relations = req.getRelatedUserIds().stream().map(relatedUserId -> { - SysUserRelation relation = new SysUserRelation(); - relation.setUserId(userId); - relation.setRelatedUserId(relatedUserId); - relation.setRelationType(relationType); - relation.setTenantId(tenantId); - relation.setCreateTime(LocalDateTime.now()); - return relation; - }).collect(Collectors.toList()); + // 为每个负责人批量插入相同的下属关系 + List relations = new ArrayList<>(); + for (Long userId : userIds) { + for (Long relatedUserId : req.getRelatedUserIds()) { + SysUserRelation relation = new SysUserRelation(); + relation.setUserId(userId); + relation.setRelatedUserId(relatedUserId); + relation.setRelationType(relationType); + relation.setTenantId(tenantId); + relation.setCreateTime(LocalDateTime.now()); + relations.add(relation); + } + } saveBatch(relations); return SdmResponse.success(); } @Override - public SdmResponse> queryRelatedUserIds(Long userId, Integer relationType) { + public SdmResponse> queryRelatedUserIds(List userIds, Integer relationType) { Long tenantId = ThreadLocalContext.getTenantId(); if (relationType == null) { relationType = UserRelationTypeEnum.SUPERVISOR_SUBORDINATE.getCode(); } LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(SysUserRelation::getUserId, userId) + queryWrapper.in(SysUserRelation::getUserId, userIds) .eq(SysUserRelation::getRelationType, relationType) .eq(SysUserRelation::getTenantId, tenantId) .select(SysUserRelation::getRelatedUserId); - List relatedUserIds = list(queryWrapper).stream() + // 查询所有负责人的下属，去重合并 + Set relatedUserIds = list(queryWrapper).stream() .map(SysUserRelation::getRelatedUserId) - .collect(Collectors.toList()); + .collect(Collectors.toSet()); - // 若无下属则返回自己的userId if (relatedUserIds.isEmpty()) { - return SdmResponse.success(Collections.singletonList(userId)); + return SdmResponse.success(userIds); } - return SdmResponse.success(relatedUserIds); + return SdmResponse.success(new ArrayList<>(relatedUserIds)); } } diff --git a/system/src/main/resources/application-dev-100.yml b/system/src/main/resources/application-dev-100.yml index 30156e8d..9600a85c 100644 --- a/system/src/main/resources/application-dev-100.yml +++ b/system/src/main/resources/application-dev-100.yml @@ -146,6 +146,7 @@ cid: queryUserDetail: /spdm-user/queryUserDetail listUserByIds: /spdm-user/listUserByIds listUserDetailByIds: /spdm-user/listUserDetailByIds + listUserDetailPage: /spdm-user/listUserDetailPage queryUserRole: /spdm-user/queryUserRole queryGroup: /spdm-user/queryGroup queryGroupDetail: /spdm-user/queryGroupDetail diff --git a/system/src/main/resources/application-dev-190.yml b/system/src/main/resources/application-dev-190.yml index 32105b76..140f4a0a 100644 --- a/system/src/main/resources/application-dev-190.yml +++ b/system/src/main/resources/application-dev-190.yml @@ -146,6 +146,7 @@ cid: queryUserDetail: /spdm-user/queryUserDetail listUserByIds: /spdm-user/listUserByIds listUserDetailByIds: /spdm-user/listUserDetailByIds + listUserDetailPage: /spdm-user/listUserDetailPage queryUserRole: /spdm-user/queryUserRole queryGroup: /spdm-user/queryGroup queryGroupDetail: /spdm-user/queryGroupDetail diff --git a/system/src/main/resources/application-dev-65.yml b/system/src/main/resources/application-dev-65.yml index 7bfa915f..bb907705 100644 --- a/system/src/main/resources/application-dev-65.yml +++ b/system/src/main/resources/application-dev-65.yml @@ -146,6 +146,7 @@ cid: queryUserDetail: /spdm-user/queryUserDetail listUserByIds: /spdm-user/listUserByIds listUserDetailByIds: /spdm-user/listUserDetailByIds + listUserDetailPage: /spdm-user/listUserDetailPage queryUserRole: /spdm-user/queryUserRole queryGroup: /spdm-user/queryGroup queryGroupDetail: /spdm-user/queryGroupDetail diff --git a/system/src/main/resources/application-local.yml b/system/src/main/resources/application-local.yml index f4a84372..f123e391 100644 --- a/system/src/main/resources/application-local.yml +++ b/system/src/main/resources/application-local.yml @@ -146,6 +146,7 @@ cid: queryUserDetail: /spdm-user/queryUserDetail listUserByIds: /spdm-user/listUserByIds listUserDetailByIds: /spdm-user/listUserDetailByIds + listUserDetailPage: /spdm-user/listUserDetailPage queryUserRole: /spdm-user/queryUserRole queryGroup: /spdm-user/queryGroup queryGroupDetail: /spdm-user/queryGroupDetail diff --git a/system/src/main/resources/application-lyric.yml b/system/src/main/resources/application-lyric.yml index ca71daea..f6364d24 100644 --- a/system/src/main/resources/application-lyric.yml +++ b/system/src/main/resources/application-lyric.yml @@ -146,6 +146,7 @@ cid: queryUserDetail: /spdm-user/queryUserDetail listUserByIds: /spdm-user/listUserByIds listUserDetailByIds: /spdm-user/listUserDetailByIds + listUserDetailPage: /spdm-user/listUserDetailPage queryUserRole: /spdm-user/queryUserRole queryGroup: /spdm-user/queryGroup queryGroupDetail: /spdm-user/queryGroupDetail diff --git a/system/src/main/resources/application-yian.yml b/system/src/main/resources/application-yian.yml index 6aaf4169..0c609d05 100644 --- a/system/src/main/resources/application-yian.yml +++ b/system/src/main/resources/application-yian.yml @@ -147,6 +147,7 @@ cid: queryUserDetail: /spdm-user/queryUserDetail listUserByIds: /dataManager/tree/node/listUserByIds listUserDetailByIds: /spdm-user/listUserDetailByIds + listUserDetailPage: /spdm-user/listUserDetailPage queryUserRole: /spdm-user/queryUserRole queryGroup: /spdm-user/queryGroup queryGroupDetail: /spdm-user/queryGroupDetail