github
/
RuoYi
mirror of https://gitee.com/y_project/RuoYi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

优化部门停用不显示

pull/3/head
RuoYi 2018-05-06 13:58:10 +08:00
parent 9d18d298e7
commit 4a0cbafa52
8 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -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`进行添加
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`进行添加

3
src/main/java/com/ruoyi/common/constant/UserConstants.java
View File

@ -20,6 +20,9 @@ public class UserConstants
/** 角色封禁状态 */
public static final int ROLE_BLOCKED = 1;
/** 部门正常状态 */
public static final int DEPT_NORMAL = 0;
/**
* 用户名长度限制
*/

13
src/main/java/com/ruoyi/project/system/dept/service/DeptServiceImpl.java
View File

@ -48,11 +48,14 @@ public class DeptServiceImpl implements IDeptService
for (Dept dept : deptList)
{
Map<String, Object> deptMap = new HashMap<String, Object>();
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<String, Object> deptMap = new HashMap<String, Object>();
deptMap.put("id", dept.getDeptId());
deptMap.put("pId", dept.getParentId());
deptMap.put("name", dept.getDeptName());
trees.add(deptMap);
}
}
return trees;
}

1
src/main/java/com/ruoyi/project/system/user/service/UserServiceImpl.java
View File

@ -162,6 +162,7 @@ public class UserServiceImpl implements IUserService
* @param user 用户信息
* @return 结果
*/
@Override
public int updateUser(User user)
{
return userDao.updateUser(user);

2
src/main/resources/static/ruoyi/system/dept/dept.js
View File

@ -20,7 +20,7 @@ function loading() {
if (item.status == '0') {
return '<span class="label label-primary">正常</span>';
} else if (item.status == '1') {
return '<span class="label label-danger">禁用</span>';
return '<span class="label label-danger">停用</span>';
}
}
},

2
src/main/resources/templates/main.html
View File

@ -75,7 +75,7 @@
</div>
<div class="ibox-content">
<p><i class="fa fa-send-o"></i> 群：<a href="https://jq.qq.com/?_wv=1027&k=5ONbr1w" target="_blank">点击加入</a>
<p><i class="fa fa-send-o"></i> 群：<a href="https://jq.qq.com/?_wv=1027&k=5HBAaYN" target="_blank">点击加入</a>
</p>
<p><i class="fa fa-qq"></i> QQ：<a href="http://wpa.qq.com/msgrd?v=3&amp;uin=346039442&amp;site=qq&amp;menu=yes" target="_blank">346039442</a>
</p>

2
src/main/resources/templates/system/dept/add.html
View File

@ -51,7 +51,7 @@
</div>
<div class="radio radio-danger radio-inline">
<input type="radio" id="radio2" name="status" value="1">
<label for="radio2">禁用</label>
<label for="radio2">停用</label>
</div>
</div>
</div>

2
src/main/resources/templates/system/dept/edit.html
View File

@ -52,7 +52,7 @@
</div>
<div class="radio radio-danger radio-inline">
<input type="radio" id="radio2" th:field="*{dept.status}" name="status" value="1">
<label for="radio2">禁用</label>
<label for="radio2">停用</label>
</div>
</div>
</div>