Alawn/springboot-payment
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge

Browse Source
This commit is contained in:
xiangwb
2017-11-20 17:52:17 +08:00
parent d7476276f0
commit 40c70a85ba
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boot-service/src/main/java/com/xwbing/constant/CommonConstant.java
+2 -2
View File
@@ -18,11 +18,11 @@ public class CommonConstant {
/**
* 启用
*/
public static final String ISENABLE = "Y";
public static final String IS_ENABLE = "Y";
/**
* 禁用
*/
public static final String ISNOTENABLE = "N";
public static final String IS_NOT_ENABLE = "N";
/**
* 邮件服务器配置项
boot-service/src/main/java/com/xwbing/service/sys/SysAuthorityService.java
+2 -2
View File
@@ -220,12 +220,12 @@ public class SysAuthorityService {
*/
private List<SysAuthority> disableChildren(String parentId) {
//获取结果
List<SysAuthority> sysAuthoritys = listByParentEnable(parentId, CommonConstant.ISENABLE);
List<SysAuthority> sysAuthoritys = listByParentEnable(parentId, CommonConstant.IS_ENABLE);
//遍历子集
List<SysAuthority> list = new ArrayList<>();
if (CollectionUtils.isNotEmpty(sysAuthoritys)) {
for (SysAuthority sysAuthority : sysAuthoritys) {
sysAuthority.setEnable(CommonConstant.ISNOTENABLE);
sysAuthority.setEnable(CommonConstant.IS_NOT_ENABLE);
sysAuthority.setModifiedTime(new Date());
list.add(sysAuthority);
list.addAll(disableChildren(sysAuthority.getId()));