From 7c9373a305e8d889cf386eedbcf06bd8291f5c28 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期二, 25 六月 2024 10:31:01 +0800
Subject: [PATCH] 多机构管理修改
---
project-admin/src/main/java/com/project/admin/controller/system/SysUserController.java | 41 +++++++++++++++++++++++++----------------
1 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/project-admin/src/main/java/com/project/admin/controller/system/SysUserController.java b/project-admin/src/main/java/com/project/admin/controller/system/SysUserController.java
index 3175f4f..dce177b 100644
--- a/project-admin/src/main/java/com/project/admin/controller/system/SysUserController.java
+++ b/project-admin/src/main/java/com/project/admin/controller/system/SysUserController.java
@@ -13,6 +13,7 @@
import com.project.common.utils.StringUtils;
import com.project.common.utils.poi.ExcelUtil;
import com.project.system.domain.bo.editBo.UserDeptBo;
+import com.project.system.domain.vo.SysUserResultVo;
import com.project.system.domain.vo.SysUserVo;
import com.project.system.service.*;
import io.swagger.annotations.ApiImplicitParam;
@@ -112,7 +113,7 @@
@PostMapping
public AjaxResult add(@Validated @RequestBody SysUser user)
{
-
+ user.setPassword(user.getPhonenumber());
if (user.getDeptId()!=null){
user.setUserType("01");
SysDept sysDept = deptService.selectDeptById(user.getDeptId());
@@ -153,6 +154,7 @@
{
userService.checkUserAllowed(user);
userService.checkUserDataScope(user.getUserId());
+ user.setPassword(user.getPhonenumber());
if (user.getDeptId()!=null){
SysDept sysDept = deptService.selectDeptById(user.getDeptId());
if (sysDept.getAncestors().contains("101") || sysDept.getDeptId().equals(101L)){
@@ -222,6 +224,13 @@
public AjaxResult batchUserDeptSave(@RequestBody UserDeptBo bo)
{
return AjaxResult.success(userDeptService.batchUserDeptSave(bo));
+ }
+
+ @ApiOperation("鐢ㄦ埛澶氭満鏋勨�斺�旀満鏋勬爲")
+ @GetMapping("/batchUserDeptTree")
+ public AjaxResult batchUserDeptTree(@RequestParam("deptId") Long deptId)
+ {
+ return AjaxResult.success(userDeptService.batchUserDeptTree(deptId));
}
@ApiOperation("浼佷笟鐢ㄦ埛閲嶇疆瀵嗙爜")
@@ -313,20 +322,20 @@
return AjaxResult.success(userService.doImport(list, deptId));
}
-// @ApiOperation(value = "鏍￠獙瀵煎叆淇℃伅")
-// @Log(title = "瀵煎叆鐢ㄦ埛淇℃伅鏍￠獙" , businessType = BusinessType.OTHER)
-// @PostMapping("/checkImport")
-// public AjaxResult checkImport(@RequestBody SysCompanyResultVo resultVo)
-// {
-// return AjaxResult.success(userService.checkImport(resultVo));
-// }
-//
-// @ApiOperation(value = "淇濆瓨瀵煎叆淇℃伅")
-// @Log(title = "瀵煎叆鐢ㄦ埛淇℃伅淇濆瓨" , businessType = BusinessType.IMPORT)
-// @PostMapping("/saveImport")
-// public AjaxResult saveImport(@RequestBody SysCompanyResultVo resultVo)
-// {
-// return toAjax(userService.saveImport(resultVo) ? 1 : 0);
-// }
+ @ApiOperation(value = "鏍￠獙瀵煎叆淇℃伅")
+ @Log(title = "瀵煎叆鐢ㄦ埛淇℃伅鏍￠獙" , businessType = BusinessType.OTHER)
+ @PostMapping("/checkImport")
+ public AjaxResult checkImport(@RequestBody SysUserResultVo resultVo)
+ {
+ return AjaxResult.success(userService.checkImport(resultVo));
+ }
+
+ @ApiOperation(value = "淇濆瓨瀵煎叆淇℃伅")
+ @Log(title = "瀵煎叆鐢ㄦ埛淇℃伅淇濆瓨" , businessType = BusinessType.IMPORT)
+ @PostMapping("/saveImport")
+ public AjaxResult saveImport(@RequestBody SysUserResultVo resultVo)
+ {
+ return toAjax(userService.saveImport(resultVo) ? 1 : 0);
+ }
}
--
Gitblit v1.9.1