diff --git a/README.md b/README.md index 746dc100..59c7cc76 100644 --- a/README.md +++ b/README.md @@ -47,4 +47,4 @@ ## 若依交流群 -QQ群: [![加入QQ群](https://img.shields.io/badge/QQ群-1389287-blue.svg)](http://shang.qq.com/wpa/qunwpa?idkey=9a7d9f3274e4bfbf7e40e4a485ff6dc2adbeee8086ce39e40667ed4387414f12) 或 [![加入QQ群](https://img.shields.io/badge/QQ群-1389287-blue.svg)](https://jq.qq.com/?_wv=1027&k=5ONbr1w),推荐点击按钮入群,当然如果无法成功操作,请自行搜索群号`1389287`进行添加 \ No newline at end of file +QQ群: [![加入QQ群](https://img.shields.io/badge/QQ群-1389287-blue.svg)](http://shang.qq.com/wpa/qunwpa?idkey=4a9a52f5d9d9c65a8ea67859170ba835d95fc50ec74a2a722293e60e036b5016) 或 [![加入QQ群](https://img.shields.io/badge/QQ群-1389287-blue.svg)](https://jq.qq.com/?_wv=1027&k=5HBAaYN),推荐点击按钮入群,当然如果无法成功操作,请自行搜索群号`1389287`进行添加 \ No newline at end of file diff --git a/src/main/java/com/ruoyi/common/constant/UserConstants.java b/src/main/java/com/ruoyi/common/constant/UserConstants.java index 90fbb86a..fcf8e625 100644 --- a/src/main/java/com/ruoyi/common/constant/UserConstants.java +++ b/src/main/java/com/ruoyi/common/constant/UserConstants.java @@ -20,6 +20,9 @@ public class UserConstants /** 角色封禁状态 */ public static final int ROLE_BLOCKED = 1; + /** 部门正常状态 */ + public static final int DEPT_NORMAL = 0; + /** * 用户名长度限制 */ diff --git a/src/main/java/com/ruoyi/project/system/dept/service/DeptServiceImpl.java b/src/main/java/com/ruoyi/project/system/dept/service/DeptServiceImpl.java index b63045d0..b5773055 100644 --- a/src/main/java/com/ruoyi/project/system/dept/service/DeptServiceImpl.java +++ b/src/main/java/com/ruoyi/project/system/dept/service/DeptServiceImpl.java @@ -48,11 +48,14 @@ public class DeptServiceImpl implements IDeptService for (Dept dept : deptList) { - Map deptMap = new HashMap(); - deptMap.put("id", dept.getDeptId()); - deptMap.put("pId", dept.getParentId()); - deptMap.put("name", dept.getDeptName()); - trees.add(deptMap); + if (UserConstants.DEPT_NORMAL == dept.getStatus()) + { + Map deptMap = new HashMap(); + deptMap.put("id", dept.getDeptId()); + deptMap.put("pId", dept.getParentId()); + deptMap.put("name", dept.getDeptName()); + trees.add(deptMap); + } } return trees; } diff --git a/src/main/java/com/ruoyi/project/system/user/service/UserServiceImpl.java b/src/main/java/com/ruoyi/project/system/user/service/UserServiceImpl.java index 24a3ba62..5b56f67c 100644 --- a/src/main/java/com/ruoyi/project/system/user/service/UserServiceImpl.java +++ b/src/main/java/com/ruoyi/project/system/user/service/UserServiceImpl.java @@ -162,6 +162,7 @@ public class UserServiceImpl implements IUserService * @param user 用户信息 * @return 结果 */ + @Override public int updateUser(User user) { return userDao.updateUser(user); diff --git a/src/main/resources/static/ruoyi/system/dept/dept.js b/src/main/resources/static/ruoyi/system/dept/dept.js index 998ea177..81377f2c 100644 --- a/src/main/resources/static/ruoyi/system/dept/dept.js +++ b/src/main/resources/static/ruoyi/system/dept/dept.js @@ -20,7 +20,7 @@ function loading() { if (item.status == '0') { return '正常'; } else if (item.status == '1') { - return '禁用'; + return '停用'; } } }, diff --git a/src/main/resources/templates/main.html b/src/main/resources/templates/main.html index c3e9db33..b3ba75f9 100644 --- a/src/main/resources/templates/main.html +++ b/src/main/resources/templates/main.html @@ -75,7 +75,7 @@
-

群:点击加入 +

群:点击加入

QQ:346039442

diff --git a/src/main/resources/templates/system/dept/add.html b/src/main/resources/templates/system/dept/add.html index 0e26d515..7e406706 100644 --- a/src/main/resources/templates/system/dept/add.html +++ b/src/main/resources/templates/system/dept/add.html @@ -51,7 +51,7 @@
- +
diff --git a/src/main/resources/templates/system/dept/edit.html b/src/main/resources/templates/system/dept/edit.html index 542ea754..70334a25 100644 --- a/src/main/resources/templates/system/dept/edit.html +++ b/src/main/resources/templates/system/dept/edit.html @@ -52,7 +52,7 @@
- +