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-15 16:31:52 +08:00
parent 57fd86750b
commit 02fddb971b
5 changed files with 65 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boot-service/src/main/java/com/xwbing/service/SysAuthorityService.java
+30 -5
View File
@@ -69,7 +69,12 @@ public class SysAuthorityService {
SysAuthority one = getById(id);
if (one == null)
throw new BusinessException("该权限不存在");
//删除自身
sysAuthorityRepository.delete(id);
//如果有子节点,递归删除子节点
List<SysAuthority> list = listChildrenForRemove(id);
if (CollectionUtils.isNotEmpty(list))
sysAuthorityRepository.deleteInBatch(list);
result.setMessage("删除成功");
result.setSuccess(true);
return result;
@@ -172,7 +177,7 @@ public class SysAuthorityService {
* @return
*/
public boolean disableChildrenByParentId(String parentId) {
List<SysAuthority> sysAuthorities = queryAllChildren(parentId);
List<SysAuthority> sysAuthorities = listChildren(parentId);
if (CollectionUtils.isNotEmpty(sysAuthorities)) {
List<SysAuthority> save = sysAuthorityRepository.save(sysAuthorities);
return CollectionUtils.isNotEmpty(save);
@@ -187,7 +192,7 @@ public class SysAuthorityService {
* @param enable
* @return
*/
public List<SysAuthVo> queryAllChildren(String parentId, String enable) {
public List<SysAuthVo> listChildren(String parentId, String enable) {
List<SysAuthVo> list = new ArrayList<>();
List<SysAuthority> authoritys;
if (StringUtils.isNotEmpty(enable))
@@ -199,7 +204,7 @@ public class SysAuthorityService {
SysAuthVo vo;
for (SysAuthority authority : authoritys) {
vo = new SysAuthVo(authority);
vo.setChildren(queryAllChildren(vo.getId(), enable));
vo.setChildren(listChildren(vo.getId(), enable));
list.add(vo);
}
return list;
@@ -211,7 +216,7 @@ public class SysAuthorityService {
* @param parentId
* @return
*/
private List<SysAuthority> queryAllChildren(String parentId) {
private List<SysAuthority> listChildren(String parentId) {
//获取结果
List<SysAuthority> sysAuthoritys = listByParentEnable(parentId, CommonConstant.ISENABLE);
//遍历子集
@@ -221,7 +226,27 @@ public class SysAuthorityService {
sysAuthority.setEnable(CommonConstant.ISNOTENABLE);
sysAuthority.setModifiedTime(new Date());
list.add(sysAuthority);
list.addAll(queryAllChildren(sysAuthority.getId()));
list.addAll(listChildren(sysAuthority.getId()));
}
}
return list;
}
/**
* 刪除时递归获取所有子节点
*
* @param parentId
* @return
*/
private List<SysAuthority> listChildrenForRemove(String parentId) {
//获取结果
List<SysAuthority> sysAuthoritys = listByParentEnable(parentId, null);
//遍历子集
List<SysAuthority> list = new ArrayList<>();
if (CollectionUtils.isNotEmpty(sysAuthoritys)) {
for (SysAuthority sysAuthority : sysAuthoritys) {
list.add(sysAuthority);
list.addAll(listChildren(sysAuthority.getId()));
}
}
return list;
boot-service/src/main/java/com/xwbing/service/SysUserService.java
+3 -3
View File
@@ -51,7 +51,7 @@ public class SysUserService {
if (old != null) {
throw new BusinessException("已经存在此用户名");
}
String id=PassWordUtil.createId();
String id = PassWordUtil.createId();
sysUser.setId(id);
sysUser.setCreateTime(new Date());
// 获取初始密码
@@ -85,7 +85,7 @@ public class SysUserService {
RestMessage result = new RestMessage();
SysUser old = getOne(id);
if (old == null) {
throw new BusinessException("该对象不存在");
throw new BusinessException("该用户不存在");
}
if (id.equals(CommonDataUtil.getToken(CommonConstant.CURRENT_USER_ID))) {
throw new BusinessException("不能删除当前登录用户");
@@ -116,7 +116,7 @@ public class SysUserService {
RestMessage result = new RestMessage();
SysUser old = getOne(sysUser.getId());
if (old == null) {
throw new BusinessException("该对象不存在");
throw new BusinessException("该用户不存在");
}
if (old.getId().equals(CommonDataUtil.getToken(CommonConstant.CURRENT_USER_ID))) {
throw new BusinessException("不能修改当前登录用户");