From 0c91f5deaa03212b2a0746d40c244925288abf7d Mon Sep 17 00:00:00 2001 From: dk <1260500659@qq.com> Date: Thu, 16 Apr 2026 20:29:36 +0800 Subject: [PATCH] =?UTF-8?q?fix(system-api=E3=80=81boot):=20=E7=BB=99?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E7=9A=84=E5=90=84=E7=A7=8D=E9=9C=80=E8=A6=81company?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=9A=84=E7=B1=BB=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?company=E5=AD=97=E6=AE=B5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/api/user/dto/AdminUserRespDTO.java | 3 +++ .../admin/auth/vo/AuthPermissionInfoRespVO.java | 3 +++ .../admin/auth/vo/AuthRegisterReqVO.java | 4 ++++ .../admin/auth/vo/AuthUserInfoRespVO.java | 3 +++ .../controller/admin/dict/DictDataController.java | 15 +++++++++++++++ .../oauth2/vo/user/OAuth2UserInfoRespVO.java | 3 +++ .../admin/user/vo/profile/UserProfileRespVO.java | 3 +++ .../admin/user/vo/user/UserImportExcelVO.java | 3 +++ .../admin/user/vo/user/UserPageReqVO.java | 3 +++ .../controller/admin/user/vo/user/UserRespVO.java | 4 ++++ .../admin/user/vo/user/UserSaveReqVO.java | 5 +++++ .../module/system/convert/auth/AuthConvert.java | 1 + .../system/dal/dataobject/user/AdminUserDO.java | 5 +++++ .../system/dal/mysql/user/AdminUserMapper.java | 1 + 14 files changed, 56 insertions(+) diff --git a/rdms-system/rdms-system-api/src/main/java/com/njcn/rdms/module/system/api/user/dto/AdminUserRespDTO.java b/rdms-system/rdms-system-api/src/main/java/com/njcn/rdms/module/system/api/user/dto/AdminUserRespDTO.java index 29b5cf8..f5665d3 100644 --- a/rdms-system/rdms-system-api/src/main/java/com/njcn/rdms/module/system/api/user/dto/AdminUserRespDTO.java +++ b/rdms-system/rdms-system-api/src/main/java/com/njcn/rdms/module/system/api/user/dto/AdminUserRespDTO.java @@ -14,6 +14,9 @@ public class AdminUserRespDTO implements VO { @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "小王") private String nickname; + @Schema(description = "所属公司", example = "灿能") + private String company; + @Schema(description = "帐号状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") private Integer status; // 参见 CommonStatusEnum 枚举 diff --git a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/controller/admin/auth/vo/AuthPermissionInfoRespVO.java b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/controller/admin/auth/vo/AuthPermissionInfoRespVO.java index 2d6b3a7..77912a7 100644 --- a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/controller/admin/auth/vo/AuthPermissionInfoRespVO.java +++ b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/controller/admin/auth/vo/AuthPermissionInfoRespVO.java @@ -41,6 +41,9 @@ public class AuthPermissionInfoRespVO { @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "灿能源码") private String nickname; + @Schema(description = "所属公司", example = "灿能") + private String company; + @Schema(description = "用户头像", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn/xx.jpg") private String avatar; diff --git a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/controller/admin/auth/vo/AuthRegisterReqVO.java b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/controller/admin/auth/vo/AuthRegisterReqVO.java index 14c1a16..6b74a10 100644 --- a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/controller/admin/auth/vo/AuthRegisterReqVO.java +++ b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/controller/admin/auth/vo/AuthRegisterReqVO.java @@ -24,6 +24,10 @@ public class AuthRegisterReqVO extends CaptchaVerificationReqVO { @Size(max = 30, message = "用户昵称长度不能超过 30 个字符") private String nickname; + @Schema(description = "所属公司", example = "灿能") + @Size(max = 100, message = "所属公司长度不能超过 100 个字符") + private String company; + @Schema(description = "所属部门编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") @NotNull(message = "所属部门不能为空") private Long deptId; diff --git a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/controller/admin/auth/vo/AuthUserInfoRespVO.java b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/controller/admin/auth/vo/AuthUserInfoRespVO.java index 3d5d784..c2b75bf 100644 --- a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/controller/admin/auth/vo/AuthUserInfoRespVO.java +++ b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/controller/admin/auth/vo/AuthUserInfoRespVO.java @@ -21,6 +21,9 @@ public class AuthUserInfoRespVO { @Schema(description = "用户账号", requiredMode = Schema.RequiredMode.REQUIRED, example = "admin") private String userName; + @Schema(description = "所属公司", example = "灿能") + private String company; + @Schema(description = "角色编码列表", example = "[\"SUPER_ADMIN\"]") private List roles; diff --git a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/controller/admin/dict/DictDataController.java b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/controller/admin/dict/DictDataController.java index 3a71052..ee8aeb2 100644 --- a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/controller/admin/dict/DictDataController.java +++ b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/controller/admin/dict/DictDataController.java @@ -12,7 +12,9 @@ import com.njcn.rdms.module.system.controller.admin.dict.vo.data.DictDataRespVO; import com.njcn.rdms.module.system.controller.admin.dict.vo.data.DictDataSaveReqVO; import com.njcn.rdms.module.system.controller.admin.dict.vo.data.DictDataSimpleRespVO; import com.njcn.rdms.module.system.dal.dataobject.dict.DictDataDO; +import com.njcn.rdms.module.system.dal.dataobject.dict.DictTypeDO; import com.njcn.rdms.module.system.service.dict.DictDataService; +import com.njcn.rdms.module.system.service.dict.DictTypeService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -38,6 +40,9 @@ public class DictDataController { @Resource private DictDataService dictDataService; + @Resource + private DictTypeService dictTypeService; + @PostMapping("/create") @Operation(summary = "新增字典数据") @PreAuthorize("@ss.hasPermission('system:dict:create')") @@ -98,6 +103,16 @@ public class DictDataController { return success(BeanUtils.toBean(dictData, DictDataRespVO.class)); } + @GetMapping(value = "/code") + @Operation(summary = "/通过字典编码去查询字典数据详细") + @Parameter(name = "code", description = "编号", required = true, example = "system_user_company") + @PreAuthorize("@ss.hasPermission('system:dict:query')") + public CommonResult> getDictData(@RequestParam("code") String code) { + DictTypeDO dictType = dictTypeService.getDictType(code); + List dictDataList = dictDataService.getDictDataList(0, dictType.getType()); + return success(BeanUtils.toBean(dictDataList, DictDataRespVO.class)); + } + @GetMapping("/export-excel") @Operation(summary = "导出字典数据") @PreAuthorize("@ss.hasPermission('system:dict:export')") diff --git a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/controller/admin/oauth2/vo/user/OAuth2UserInfoRespVO.java b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/controller/admin/oauth2/vo/user/OAuth2UserInfoRespVO.java index c05f28b..d8afbe6 100644 --- a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/controller/admin/oauth2/vo/user/OAuth2UserInfoRespVO.java +++ b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/controller/admin/oauth2/vo/user/OAuth2UserInfoRespVO.java @@ -20,6 +20,9 @@ public class OAuth2UserInfoRespVO { @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "灿能") private String nickname; + @Schema(description = "所属公司", example = "灿能") + private String company; + @Schema(description = "用户邮箱", example = "rdms@iocoder.cn") private String email; diff --git a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/controller/admin/user/vo/profile/UserProfileRespVO.java b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/controller/admin/user/vo/profile/UserProfileRespVO.java index b30dcc2..0269473 100644 --- a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/controller/admin/user/vo/profile/UserProfileRespVO.java +++ b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/controller/admin/user/vo/profile/UserProfileRespVO.java @@ -22,6 +22,9 @@ public class UserProfileRespVO { @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "awen") private String nickname; + @Schema(description = "所属公司", example = "灿能") + private String company; + @Schema(description = "用户邮箱", example = "rdms@iocoder.cn") private String email; diff --git a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/controller/admin/user/vo/user/UserImportExcelVO.java b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/controller/admin/user/vo/user/UserImportExcelVO.java index 4bbae50..f05da40 100644 --- a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/controller/admin/user/vo/user/UserImportExcelVO.java +++ b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/controller/admin/user/vo/user/UserImportExcelVO.java @@ -24,6 +24,9 @@ public class UserImportExcelVO { @ExcelProperty("用户名称") private String nickname; + @ExcelProperty("所属公司") + private String company; + @ExcelProperty("部门编号") private Long deptId; diff --git a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/controller/admin/user/vo/user/UserPageReqVO.java b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/controller/admin/user/vo/user/UserPageReqVO.java index 344457b..400e367 100644 --- a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/controller/admin/user/vo/user/UserPageReqVO.java +++ b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/controller/admin/user/vo/user/UserPageReqVO.java @@ -25,6 +25,9 @@ public class UserPageReqVO extends PageParam { @Schema(description = "手机号码，模糊匹配", example = "rdms") private String mobile; + @Schema(description = "所属公司，模糊匹配", example = "灿能") + private String company; + @Schema(description = "展示状态，参见 CommonStatusEnum 枚举类", example = "1") private Integer status; diff --git a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/controller/admin/user/vo/user/UserRespVO.java b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/controller/admin/user/vo/user/UserRespVO.java index 839a761..c3b1e64 100644 --- a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/controller/admin/user/vo/user/UserRespVO.java +++ b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/controller/admin/user/vo/user/UserRespVO.java @@ -30,6 +30,10 @@ public class UserRespVO { @Schema(description = "备注", example = "我是一个用户") private String remark; + @Schema(description = "所属公司", example = "灿能") + @ExcelProperty("所属公司") + private String company; + @Schema(description = "部门编号", example = "1") private Long deptId; diff --git a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/controller/admin/user/vo/user/UserSaveReqVO.java b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/controller/admin/user/vo/user/UserSaveReqVO.java index 63f10b8..74d9b6b 100644 --- a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/controller/admin/user/vo/user/UserSaveReqVO.java +++ b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/controller/admin/user/vo/user/UserSaveReqVO.java @@ -42,6 +42,11 @@ public class UserSaveReqVO { @DiffLogField(name = "备注") private String remark; + @Schema(description = "所属公司", example = "灿能") + @Size(max = 100, message = "所属公司长度不能超过 100 个字符") + @DiffLogField(name = "所属公司") + private String company; + @Schema(description = "部门编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") @NotNull(message = "部门不能为空") @DiffLogField(name = "部门", function = DeptParseFunction.NAME) diff --git a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/convert/auth/AuthConvert.java b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/convert/auth/AuthConvert.java index 9d5a7a7..cc2b74f 100644 --- a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/convert/auth/AuthConvert.java +++ b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/convert/auth/AuthConvert.java @@ -57,6 +57,7 @@ public interface AuthConvert { return AuthUserInfoRespVO.builder() .userId(String.valueOf(user.getId())) .userName(user.getUsername()) + .company(user.getCompany()) .roles(sortDistinctStrings(convertList(roleList, RoleDO::getCode))) .buttons(sortDistinctStrings(convertList(menuList, MenuDO::getPermission, menu -> StrUtil.isNotBlank(menu.getPermission())))) diff --git a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/dal/dataobject/user/AdminUserDO.java b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/dal/dataobject/user/AdminUserDO.java index dafcb3d..0a56b8c 100644 --- a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/dal/dataobject/user/AdminUserDO.java +++ b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/dal/dataobject/user/AdminUserDO.java @@ -57,6 +57,11 @@ public class AdminUserDO extends BaseDO { */ private String remark; + /** + * 所属公司 + */ + private String company; + /** * 部门 ID */ diff --git a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/dal/mysql/user/AdminUserMapper.java b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/dal/mysql/user/AdminUserMapper.java index bcf3a53..fdf5a72 100644 --- a/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/dal/mysql/user/AdminUserMapper.java +++ b/rdms-system/rdms-system-boot/src/main/java/com/njcn/rdms/module/system/dal/mysql/user/AdminUserMapper.java @@ -29,6 +29,7 @@ public interface AdminUserMapper extends BaseMapperX { return selectPage(reqVO, new LambdaQueryWrapperX() .likeIfPresent(AdminUserDO::getUsername, reqVO.getUsername()) .likeIfPresent(AdminUserDO::getMobile, reqVO.getMobile()) + .likeIfPresent(AdminUserDO::getCompany, reqVO.getCompany()) .eqIfPresent(AdminUserDO::getStatus, reqVO.getStatus()) .betweenIfPresent(AdminUserDO::getCreateTime, reqVO.getCreateTime()) .inIfPresent(AdminUserDO::getDeptId, deptIds)