Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/RentalHo...

44323

2024-01-02 212620a41d4b61e526b02101c553eb61c2fb9014

 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));