From d4f9e73dc6f275a44b45afa13b5af4bf45cae073 Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期五, 28 十月 2022 11:10:19 +0800
Subject: [PATCH] 用戶表刪除部门Id逻辑修改

---
 ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java b/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java
index 67706d1..f3d12e7 100644
--- a/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java
+++ b/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ycl.annotation.LogSave;
 import com.ycl.api.CommonResult;
 import com.ycl.controller.BaseController;
 import com.ycl.dto.UmsAdminLoginParam;
@@ -53,6 +54,7 @@
     @ApiOperation(value = "鐢ㄦ埛娉ㄥ唽")
     @RequestMapping(value = "/register", method = RequestMethod.POST)
     @ResponseBody
+    @LogSave(operationType = "鐢ㄦ埛绠＄悊", contain = "娣诲姞鐢ㄦ埛")
     public CommonResult<UmsAdmin> register(@Validated @RequestBody UmsAdminParam umsAdminParam) {
         UmsAdmin umsAdmin = adminService.register(umsAdminParam);
         if (umsAdmin == null) {
@@ -100,6 +102,7 @@
         String username = principal.getName();
         UmsAdmin umsAdmin = adminService.getAdminByUsername(username);
         Map<String, Object> data = new HashMap<>();
+        data.put("userId", umsAdmin.getId());
         data.put("username", umsAdmin.getUsername());
         data.put("menus", roleService.getMenuList(umsAdmin.getId()));
         data.put("icon", umsAdmin.getIcon());
@@ -139,6 +142,7 @@
     @ApiOperation("淇敼鎸囧畾鐢ㄦ埛淇℃伅")
     @RequestMapping(value = "/update/{id}", method = RequestMethod.POST)
     @ResponseBody
+    @LogSave(operationType = "鐢ㄦ埛绠＄悊", contain = "淇敼鐢ㄦ埛")
     public CommonResult update(@PathVariable Long id, @RequestBody UmsAdmin admin) {
         boolean success = adminService.update(id, admin);
         if (success) {
@@ -150,6 +154,7 @@
     @ApiOperation("淇敼鎸囧畾鐢ㄦ埛瀵嗙爜")
     @RequestMapping(value = "/updatePassword", method = RequestMethod.POST)
     @ResponseBody
+    @LogSave(operationType = "鐢ㄦ埛绠＄悊", contain = "淇敼鐢ㄦ埛瀵嗙爜")
     public CommonResult updatePassword(@Validated @RequestBody UpdateAdminPasswordParam updatePasswordParam) {
         int status = adminService.updatePassword(updatePasswordParam);
         if (status > 0) {
@@ -168,6 +173,7 @@
     @ApiOperation("鍒犻櫎鎸囧畾鐢ㄦ埛淇℃伅")
     @RequestMapping(value = "/delete/{id}", method = RequestMethod.POST)
     @ResponseBody
+    @LogSave(operationType = "鐢ㄦ埛绠＄悊", contain = "鍒犻櫎鐢ㄦ埛")
     public CommonResult delete(@PathVariable Long id) {
         boolean success = adminService.delete(id);
         if (success) {
@@ -179,6 +185,7 @@
     @ApiOperation("淇敼甯愬彿鐘舵��")
     @RequestMapping(value = "/updateStatus/{id}", method = RequestMethod.POST)
     @ResponseBody
+    @LogSave(operationType = "鐢ㄦ埛绠＄悊", contain = "鐢ㄦ埛璐﹀彿鍚敤/绂佺敤")
     public CommonResult updateStatus(@PathVariable Long id, @RequestParam(value = "status") Integer status) {
         UmsAdmin umsAdmin = new UmsAdmin();
         umsAdmin.setStatus(status);
@@ -212,9 +219,10 @@
     @ApiOperation("鎵归噺鍒犻櫎鐢ㄦ埛")
     @RequestMapping(value = "/deleteBatch", method = RequestMethod.POST)
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "ids", value = "鐢ㄦ埛Ids",required = true, dataType = "Array")
+            @ApiImplicitParam(name = "ids", value = "鐢ㄦ埛Ids", required = true, dataType = "Array")
     })
     @ResponseBody
+    @LogSave(operationType = "鐢ㄦ埛绠＄悊", contain = "鎵归噺鍒犻櫎鐢ㄦ埛")
     public CommonResult deleteBatch(@RequestParam("ids") List<Long> ids) {
         boolean success = adminService.deleteBatch(ids);
         if (success) {
@@ -226,10 +234,11 @@
     @ApiOperation("鎵归噺淇敼鐢ㄦ埛鐘舵��")
     @RequestMapping(value = "/updateStatusBatch", method = RequestMethod.POST)
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "ids", value = "鐢ㄦ埛Ids",required = true, dataType = "Array"),
-            @ApiImplicitParam(name = "status", value = "鐘舵��0->绂佺敤锛�1->鍚敤",required = true, dataType = "Integer")
+            @ApiImplicitParam(name = "ids", value = "鐢ㄦ埛Ids", required = true, dataType = "Array"),
+            @ApiImplicitParam(name = "status", value = "鐘舵��0->绂佺敤锛�1->鍚敤", required = true, dataType = "Integer")
     })
     @ResponseBody
+    @LogSave(operationType = "鐢ㄦ埛绠＄悊", contain = "鐢ㄦ埛璐﹀彿鎵归噺鍚敤/绂佺敤")
     public CommonResult updateStatusBatch(@RequestParam("ids") List<Long> ids, @RequestParam(value = "status") Integer status) {
         boolean success = adminService.updateStatusBatch(ids, status);
         if (success) {
@@ -238,12 +247,10 @@
         return CommonResult.failed();
     }
 
-
     @ApiOperation("鑾峰彇閮ㄩ棬浜哄憳")
     @RequestMapping(value = "/getDepartUser/{departId}", method = RequestMethod.GET)
     @ResponseBody
     public CommonResult<List<UmsAdmin>> getDepartUser(@PathVariable Long departId) {
         return CommonResult.success(adminService.getDepartUser(departId));
     }
-
-}
+}
\ No newline at end of file

--
Gitblit v1.8.0