From 5db13c2ad6678cf4614b81c95df035c6f47d313d Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 16 十月 2026 21:57:36 +0800
Subject: [PATCH] feat(hrm): 考勤规则放开部门唯一限制，支持同一部门多班次
---
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
index 9212aaf..e855b2d 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
@@ -42,6 +42,8 @@
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.USER_POST_NOT_EMPTY;
@Tag(name = "绠＄悊鍚庡彴 - 鐢ㄦ埛")
@RestController
@@ -62,6 +64,10 @@
@Operation(summary = "鏂板鐢ㄦ埛")
@PreAuthorize("@ss.hasPermission('system:user:create')")
public CommonResult<Long> createUser(@Valid @RequestBody UserSaveReqVO reqVO) {
+ // 鏍￠獙宀椾綅蹇呭～
+ if (CollUtil.isEmpty(reqVO.getPostIds())) {
+ throw exception(USER_POST_NOT_EMPTY);
+ }
Long id = userService.createUser(reqVO);
return success(id);
}
@@ -70,6 +76,10 @@
@Operation(summary = "淇敼鐢ㄦ埛")
@PreAuthorize("@ss.hasPermission('system:user:update')")
public CommonResult<Boolean> updateUser(@Valid @RequestBody UserSaveReqVO reqVO) {
+ // 鏍￠獙宀椾綅蹇呭～
+ if (CollUtil.isEmpty(reqVO.getPostIds())) {
+ throw exception(USER_POST_NOT_EMPTY);
+ }
userService.updateUser(reqVO);
return success(true);
}
@@ -214,12 +224,14 @@
@GetMapping("/get-import-template")
@Operation(summary = "鑾峰緱瀵煎叆鐢ㄦ埛妯℃澘")
public void importTemplate(HttpServletResponse response) throws IOException {
- // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo锛氶儴闂ㄣ�佸矖浣嶈濉啓绯荤粺閲屽凡缁忓瓨鍦ㄧ殑鍚嶇О锛涘涓矖浣嶇敤銆屻�併�嶅垎闅�
List<UserImportExcelVO> list = Arrays.asList(
- UserImportExcelVO.builder().username("yunai").deptId(1L).email("yunai@iocoder.cn").mobile("15601691300")
- .nickname("瓒呯骇绠＄悊鍛�").status(CommonStatusEnum.ENABLE.getStatus()).sex(SexEnum.MALE.getSex()).build(),
- UserImportExcelVO.builder().username("yuanma").deptId(2L).email("yuanma@iocoder.cn").mobile("15601701300")
- .nickname("婧愮爜").status(CommonStatusEnum.DISABLE.getStatus()).sex(SexEnum.FEMALE.getSex()).build()
+ UserImportExcelVO.builder().username("zhangsan").nickname("寮犱笁").dept("缁煎悎绠＄悊閮�").post("鏅�氬憳宸�")
+ .email("zhangsan@example.com").mobile("15601691300").password("123456")
+ .status(CommonStatusEnum.ENABLE.getStatus()).sex(SexEnum.MALE.getSex()).build(),
+ UserImportExcelVO.builder().username("lisi").nickname("鏉庡洓").dept("缁煎悎绠＄悊閮�").post("鏅�氬憳宸ャ�佺彮缁勯暱")
+ .email("lisi@example.com").mobile("15601701300").password("123456")
+ .status(CommonStatusEnum.ENABLE.getStatus()).sex(SexEnum.FEMALE.getSex()).build()
);
// 杈撳嚭
ExcelUtils.write(response, "鐢ㄦ埛瀵煎叆妯℃澘.xls", "鐢ㄦ埛鍒楄〃", UserImportExcelVO.class, list);
--
Gitblit v1.9.3