From 7d1a3750efa7fb69551edbe36ac3ec11243950f1 Mon Sep 17 00:00:00 2001
From: zhangke <sunwill6677@>
Date: Thu, 25 Sep 2025 09:20:36 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E4=BE=9B=E6=87=89?=
 =?UTF-8?q?=E5=95=86=E6=B2=92=E6=9C=89=E9=96=8B=E9=80=9A=E6=AC=8A=E9=99=90?=
 =?UTF-8?q?=E7=9A=84=E6=99=82=E5=80=99=EF=BC=8C=E5=88=AA=E9=99=A4=E5=A0=B1?=
 =?UTF-8?q?=E9=8C=AF=E7=9A=84=E5=95=8F=E9=A1=8C=202=E3=80=81=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=88=AA=E9=99=A4=E7=94=A8=E6=88=B6=E7=9A=84=20?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/admin/controller/UserController.java     |  8 ++++----
 .../com/nflg/wms/common/pojo/qo/FilterIdQO.java  | 16 ++++++++++++++++
 .../repository/service/impl/UserServiceImpl.java |  5 ++++-
 .../main/resources/mapper/UserRoleMapMapper.xml  |  4 +++-
 4 files changed, 27 insertions(+), 6 deletions(-)
 create mode 100644 nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/FilterIdQO.java

diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/UserController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/UserController.java
index 55c04a00..5d378fc5 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/UserController.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/UserController.java
@@ -30,7 +30,7 @@ public class UserController extends BaseController {
      * 新增用户
      */
     @PostMapping("add")
-    public ApiResult<Void> add(@Valid @RequestBody UserAddQO request){
+    public ApiResult<Void> add(@Valid @RequestBody UserAddQO request) {
         userControllerService.add(request);
         return ApiResult.success();
     }
@@ -39,7 +39,7 @@ public class UserController extends BaseController {
      * 更新用户
      */
     @PostMapping("update")
-    public ApiResult<Void> update(@Valid @RequestBody UserUpdateQO request){
+    public ApiResult<Void> update(@Valid @RequestBody UserUpdateQO request) {
         userControllerService.update(request);
         return ApiResult.success();
     }
@@ -65,8 +65,8 @@ public class UserController extends BaseController {
      * 删除用户
      */
     @PostMapping("delete")
-    public ApiResult<Void> delete(@Valid @NotNull Long id){
-        userControllerService.delete(id);
+    public ApiResult<Void> delete(@Valid @RequestBody FilterIdQO request) {
+        userControllerService.delete(request.getId());
         return ApiResult.success();
     }
 
diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/FilterIdQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/FilterIdQO.java
new file mode 100644
index 00000000..3ae72d85
--- /dev/null
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/FilterIdQO.java
@@ -0,0 +1,16 @@
+package com.nflg.wms.common.pojo.qo;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+public class FilterIdQO {
+
+    /**
+     * 主键ID
+     */
+    @NotNull
+    private Long id;
+}
diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/UserServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/UserServiceImpl.java
index a9eb717c..b6b10c93 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/UserServiceImpl.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/UserServiceImpl.java
@@ -78,7 +78,10 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
     @Override
     public void delete(Long id) {
         User user = getById(id);
-        VUtil.trueThrowBusinessError(Objects.isNull(user)).throwMessage("用户不存在");
+        //VUtil.trueThrowBusinessError(Objects.isNull(user)).throwMessage("用户不存在");
+        if(Objects.isNull(user)) {
+            return;
+        }
         removeById(id);
         auditLogService.addDelete(User.class, user, UserUtil.getUserName());
     }
diff --git a/nflg-wms-repository/src/main/resources/mapper/UserRoleMapMapper.xml b/nflg-wms-repository/src/main/resources/mapper/UserRoleMapMapper.xml
index c88374cb..dc5c18f1 100644
--- a/nflg-wms-repository/src/main/resources/mapper/UserRoleMapMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/UserRoleMapMapper.xml
@@ -10,9 +10,11 @@
     </select>
 
     <select id="getAuthorizeUser" resultType="com.nflg.wms.common.pojo.vo.UserVO">
-        select u.*
+        select u.*,c."name" as dept_name
         from user_role_map urm
                  inner join "user" u on urm.user_id = u.id
+                 left join user_interior b on u."id"=b.user_id
+                 left join department c on b.dept_id=c."id"
         where urm.role_id = #{roleId}
     </select>