From cdc56b8f31611a2bfd03e660c488047a7c78a8c3 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期二, 20 十二月 2022 11:39:11 +0800
Subject: [PATCH] fix: 用户密码8-16长度并且不等于用户名称
---
ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java b/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java
index 4f02c6b..2d9f68f 100644
--- a/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java
+++ b/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java
@@ -9,9 +9,7 @@
import com.ycl.api.BasePageVO;
import com.ycl.api.CommonResult;
import com.ycl.controller.BaseController;
-import com.ycl.entity.depart.DepartManager;
import com.ycl.entity.depart.UmsDepart;
-import com.ycl.entity.user.UmsDepartManage;
import com.ycl.service.depart.UmsDepartService;
import com.ycl.service.user.UmsDepartManageService;
import com.ycl.utils.auth.UserAuthUtil;
@@ -85,6 +83,16 @@
return CommonResult.success(departService.removeBatchByIds(ids));
}
+ @ApiOperation("鎵瑰鐞�-寮�鍚垨鑰呯鐢ㄩ儴闂�")
+ @PutMapping(value = "/batch_status")
+ @LogSave(operationType = "閮ㄩ棬绠＄悊", contain = "鎵归噺寮�鍚垨鑰呯鐢ㄩ儴闂�")
+ public CommonResult updateBatch(@RequestBody List<UmsDepart> umsDepartList) {
+ if (umsDepartList.isEmpty()) {
+ return CommonResult.failed("bad request parameter");
+ }
+ return CommonResult.success(departService.updateBatchById(umsDepartList));
+ }
+
@ApiOperation("璇︽儏")
@PostMapping(value = "/detail")
@LogSave(operationType = "閮ㄩ棬绠＄悊", contain = "鏌ョ湅閮ㄩ棬")
@@ -126,19 +134,31 @@
@ApiOperation("鐢ㄦ埛淇敼瑙掕壊")
@PutMapping(value = "/user_update_Role")
public CommonResult userUpdateRole(@RequestParam Long id,
- @RequestParam List<Long> roles) {
+ @RequestParam List<Long> roles) {
umsAdminDepartService.userUpdateRoles(id, roles);
return CommonResult.success("update success");
}
@ApiOperation("鐢ㄦ埛淇敼閮ㄩ棬")
@PutMapping(value = "/user_update_depart")
- public CommonResult userUpdateDepart(@RequestParam Long id,
- @RequestParam List<UmsDepartManage> departmentIds) {
- umsAdminDepartService.userUpdateDepart(id, departmentIds);
+ public CommonResult userUpdateDepart(@RequestParam Long userId,
+ @RequestParam Long departId) {
+ umsAdminDepartService.userUpdateDepart(userId, departId);
return CommonResult.success("update success");
}
+ @ApiOperation("鏌ヨ涓嶅湪閮ㄩ棬鐨勫墿浣欎汉鍛�")
+ @GetMapping("/query_surplus_user")
+ public CommonResult searchSurplusUser() {
+ return CommonResult.success(departService.selectSurplusUser());
+ }
+
+ @ApiOperation("鏌ヨ涓嶅湪閮ㄩ棬鐨勫墿浣欎汉鍛樺拰宸插湪閮ㄩ棬鐨勪汉")
+ @GetMapping("/query_surplus_exist_user")
+ public CommonResult searchSurplusUser(@RequestParam Long id) {
+ return CommonResult.success(departService.selectSurplusUserAndExistUser(id));
+ }
+
@ApiOperation("鏌ヨ椤剁骇閮ㄩ棬")
@GetMapping(value = "/query_father")
public CommonResult search() {
--
Gitblit v1.8.0