From 212620a41d4b61e526b02101c553eb61c2fb9014 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 02 一月 2024 10:59:57 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/RentalHousrApplet

---
 guns-management/src/main/java/com/stylefeng/guns/modular/code/controller/SysDeptController.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/guns-management/src/main/java/com/stylefeng/guns/modular/code/controller/SysDeptController.java b/guns-management/src/main/java/com/stylefeng/guns/modular/code/controller/SysDeptController.java
index 733b570..b754027 100644
--- a/guns-management/src/main/java/com/stylefeng/guns/modular/code/controller/SysDeptController.java
+++ b/guns-management/src/main/java/com/stylefeng/guns/modular/code/controller/SysDeptController.java
@@ -80,8 +80,8 @@
     public ResultUtil delete(String ids) {
         String[] split = ids.split(",");
         for (String id : split) {
-            User user = userService.selectById(Integer.valueOf(id));
-            if (user!=null){
+            List<User> users = userService.selectList(new EntityWrapper<User>().eq("deptid",Integer.valueOf(id)));
+            if (!users.isEmpty()){
                 return ResultUtil.error("当前部门已绑定用户,无法删除");
             }
             deptService.deleteById(Integer.valueOf(id));

--
Gitblit v1.7.1