From b9248c039eee2318129e128ad959c6f2e6e46846 Mon Sep 17 00:00:00 2001
From: linzhijie <19970921lzj>
Date: 星期一, 16 八月 2021 16:27:46 +0800
Subject: [PATCH] 1、事中提示语权限开关优化 2、分配用户搜索优化

---
 src/main/java/com/ots/project/system/user/controller/UserController.java |   38 +++++++++++++++++++++++++++++---------
 1 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/ots/project/system/user/controller/UserController.java b/src/main/java/com/ots/project/system/user/controller/UserController.java
index 19ece51..e8cbe44 100644
--- a/src/main/java/com/ots/project/system/user/controller/UserController.java
+++ b/src/main/java/com/ots/project/system/user/controller/UserController.java
@@ -1,4 +1,5 @@
 package com.ots.project.system.user.controller;
+
 import com.ots.common.constant.UserConstants;
 import com.ots.common.enums.UserTypeEnum;
 import com.ots.common.utils.StringUtils;
@@ -20,6 +21,7 @@
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+
 import java.util.List;
 
 @Controller
@@ -32,25 +34,29 @@
     private IRoleService roleService;
     @Autowired
     private IPostService postService;
+
     @RequiresPermissions("system:user:view")
     @GetMapping()
     public String user() {
         return prefix + "/user";
     }
+
     @RequiresPermissions("system:user:manager:view")
     @GetMapping("/manager")
     public String manager() {
         return prefix + "/usermanager";
     }
+
     @RequiresPermissions("system:user:list")
     @PostMapping("/list")
     @ResponseBody
     public TableDataInfo list(User user) {
         startPage();
-		user.setUserType(UserTypeEnum.SYS_USER.getUserType());
+        user.setUserType(UserTypeEnum.SYS_USER.getUserType());
         List<User> list = userService.selectUserList(user);
         return getDataTable(list);
     }
+
     @Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.EXPORT)
     @RequiresPermissions("system:user:export")
     @PostMapping("/export")
@@ -60,6 +66,7 @@
         ExcelUtil<User> util = new ExcelUtil<User>(User.class);
         return util.exportExcel(list, "鐢ㄦ埛鏁版嵁");
     }
+
     @Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.IMPORT)
     @RequiresPermissions("system:user:import")
     @PostMapping("/importData")
@@ -70,6 +77,7 @@
         String message = userService.importUser(userList, updateSupport);
         return AjaxResult.success(message);
     }
+
     @RequiresPermissions("system:user:view")
     @GetMapping("/importTemplate")
     @ResponseBody
@@ -77,14 +85,14 @@
         ExcelUtil<User> util = new ExcelUtil<User>(User.class);
         return util.importTemplateExcel("鐢ㄦ埛鏁版嵁");
     }
-    
+
     @GetMapping("/add")
     public String add(ModelMap mmap) {
         mmap.put("roles", roleService.selectRoleAll());
         mmap.put("posts", postService.selectPostAll());
         return prefix + "/add";
     }
-    
+
     @RequiresPermissions("system:user:add")
     @Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.INSERT)
     @PostMapping("/add")
@@ -99,7 +107,7 @@
         }
         return toAjax(userService.insertUser(user));
     }
-    
+
     @GetMapping("/edit/{userId}")
     public String edit(@PathVariable("userId") Long userId, ModelMap mmap) {
         mmap.put("user", userService.selectUserById(userId));
@@ -107,7 +115,7 @@
         mmap.put("posts", postService.selectPostsByUserId(userId));
         return prefix + "/edit";
     }
-    
+
     @RequiresPermissions("system:user:edit")
     @Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
@@ -122,6 +130,7 @@
         }
         return toAjax(userService.updateUser(user));
     }
+
     @RequiresPermissions("system:user:resetPwd")
     @Log(title = "閲嶇疆瀵嗙爜", businessType = BusinessType.UPDATE)
     @GetMapping("/resetPwd/{userId}")
@@ -129,6 +138,7 @@
         mmap.put("user", userService.selectUserById(userId));
         return prefix + "/resetPwd";
     }
+
     @RequiresPermissions("system:user:resetPwd")
     @Log(title = "閲嶇疆瀵嗙爜", businessType = BusinessType.UPDATE)
     @PostMapping("/resetPwd")
@@ -142,6 +152,7 @@
         }
         return error();
     }
+
     @RequiresPermissions("system:user:remove")
     @Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.DELETE)
     @PostMapping("/remove")
@@ -153,25 +164,25 @@
             return error(e.getMessage());
         }
     }
-    
+
     @PostMapping("/checkLoginNameUnique")
     @ResponseBody
     public String checkLoginNameUnique(User user) {
         return userService.checkLoginNameUnique(user.getLoginName());
     }
-    
+
     @PostMapping("/checkPhoneUnique")
     @ResponseBody
     public String checkPhoneUnique(User user) {
         return userService.checkPhoneUnique(user);
     }
-    
+
     @PostMapping("/checkEmailUnique")
     @ResponseBody
     public String checkEmailUnique(User user) {
         return userService.checkEmailUnique(user);
     }
-    
+
     @Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.UPDATE)
     @RequiresPermissions("system:user:edit")
     @PostMapping("/changeStatus")
@@ -179,4 +190,13 @@
     public AjaxResult changeStatus(User user) {
         return toAjax(userService.changeStatus(user));
     }
+
+    @Log(title = "浜嬩腑鎻愮ず璇巿鏉�", businessType = BusinessType.UPDATE)
+    @RequiresPermissions("system:user:hint:auth")
+    @GetMapping("/changeHintStatus")
+    @ResponseBody
+    public AjaxResult changeHintStatus(String userId,Integer type) {
+        //type 0鍙栨秷鎺堟潈 1鎺堟潈
+        return toAjax(userService.changeHintStatus(userId,type));
+    }
 }

--
Gitblit v1.9.1