From 951feaeef11f38701290ced94f71c9e103a419bf Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期一, 17 六月 2024 17:35:31 +0800
Subject: [PATCH] 企业信息管理，验证码登录，惠企政策添加
---
project-admin/src/main/java/com/project/admin/controller/system/SysUserController.java | 42 ++++++++++++++++++++++++++----------------
1 files changed, 26 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 ddfc6e7..335569a 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
@@ -3,8 +3,9 @@
import java.util.List;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse;
+
+import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.ArrayUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -40,19 +41,13 @@
*/
@RestController
@RequestMapping("/system/user")
+@RequiredArgsConstructor
public class SysUserController extends BaseController
{
- @Autowired
- private ISysUserService userService;
-
- @Autowired
- private ISysRoleService roleService;
-
- @Autowired
- private ISysDeptService deptService;
-
- @Autowired
- private ISysPostService postService;
+ private final ISysUserService userService;
+ private final ISysRoleService roleService;
+ private final ISysDeptService deptService;
+ private final ISysPostService postService;
/**
* 鑾峰彇鐢ㄦ埛鍒楄〃
@@ -72,7 +67,7 @@
public void export(HttpServletResponse response, SysUser user)
{
List<SysUser> list = userService.selectUserList(user);
- ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
+ ExcelUtil<SysUser> util = new ExcelUtil<>(SysUser.class);
util.exportExcel(response, list, "鐢ㄦ埛鏁版嵁");
}
@@ -81,7 +76,7 @@
@PostMapping("/importData")
public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
{
- ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
+ ExcelUtil<SysUser> util = new ExcelUtil<>(SysUser.class);
List<SysUser> userList = util.importExcel(file.getInputStream());
String operName = getUsername();
String message = userService.importUser(userList, updateSupport, operName);
@@ -91,7 +86,7 @@
@PostMapping("/importTemplate")
public void importTemplate(HttpServletResponse response)
{
- ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
+ ExcelUtil<SysUser> util = new ExcelUtil<>(SysUser.class);
util.importTemplateExcel(response, "鐢ㄦ埛鏁版嵁");
}
@@ -125,6 +120,13 @@
@PostMapping
public AjaxResult add(@Validated @RequestBody SysUser user)
{
+ if (user.getDeptId()!=null){
+ SysDept sysDept = deptService.selectDeptById(user.getDeptId());
+ if (sysDept.getAncestors().contains("101") || sysDept.getDeptId().equals(101L)){
+ user.setUserType("01");
+ }
+ }
+
if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user)))
{
return error("鏂板鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岀櫥褰曡处鍙峰凡瀛樺湪");
@@ -139,8 +141,10 @@
{
return error("鏂板鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岄偖绠辫处鍙峰凡瀛樺湪");
}
+
user.setCreateBy(getUsername());
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+ user.setRecommendUser(user.getPassword());
return toAjax(userService.insertUser(user));
}
@@ -154,6 +158,12 @@
{
userService.checkUserAllowed(user);
userService.checkUserDataScope(user.getUserId());
+ if (user.getDeptId()!=null){
+ SysDept sysDept = deptService.selectDeptById(user.getDeptId());
+ if (sysDept.getAncestors().contains("101") || sysDept.getDeptId().equals(101L)){
+ user.setUserType("01");
+ }
+ }
if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user)))
{
return error("淇敼鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岀櫥褰曡处鍙峰凡瀛樺湪");
@@ -197,7 +207,7 @@
{
userService.checkUserAllowed(user);
userService.checkUserDataScope(user.getUserId());
- user.setRemark(user.getPassword());
+ user.setRecommendUser(user.getPassword());
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
user.setUpdateBy(getUsername());
--
Gitblit v1.9.1