github/SpringBlade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug fix

Browse Source
This commit is contained in:
smallchill 2017-08-18 09:32:55 +08:00
parent 2bcf385e31
commit c0a5c005dd
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/org/springblade/common/vo/ShiroUser.java
View File

@ -15,22 +15,18 @@
*/ */
package org.springblade.common.vo; package org.springblade.common.vo;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
import org.springblade.common.tool.SysCache; import org.springblade.common.tool.SysCache;
import org.springblade.core.constant.ConstCache;
import org.springblade.core.constant.ConstCacheKey;
import org.springblade.core.plugins.dao.Db; import org.springblade.core.plugins.dao.Db;
import org.springblade.core.toolbox.Func;
import org.springblade.core.toolbox.CMap; import org.springblade.core.toolbox.CMap;
import org.springblade.core.toolbox.cache.CacheKit; import org.springblade.core.toolbox.Func;
import org.springblade.core.toolbox.cache.ILoader;
import org.springblade.core.toolbox.kit.CollectionKit; import org.springblade.core.toolbox.kit.CollectionKit;
import org.springblade.core.toolbox.kit.StrKit; import org.springblade.core.toolbox.kit.StrKit;
import org.springblade.core.toolbox.support.Convert; import org.springblade.core.toolbox.support.Convert;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
public class ShiroUser implements Serializable { public class ShiroUser implements Serializable {
@ -43,10 +39,10 @@ public class ShiroUser implements Serializable {
private String name;// 姓名 private String name;// 姓名
private List<Integer> roleList;// 角色集 private List<Integer> roleList;// 角色集
private String roles;// 角色集 private String roles;// 角色集
private Object superDepts;// 上级部门集合 private Object superDepts = "0";// 上级部门集合
private Object subDepts;// 子部门集合 private Object subDepts = "0";// 子部门集合
private Object subRoles;// 子角色集合 private Object subRoles = "0";// 子角色集合
private Object subUsers;// 子账号集合 private Object subUsers = "0";// 子账号集合
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
public ShiroUser(Object id, Object deptId, String loginName, String name, List<Integer> roleList) { public ShiroUser(Object id, Object deptId, String loginName, String name, List<Integer> roleList) {
@ -106,7 +102,7 @@ public class ShiroUser implements Serializable {
for (Map m : list) { for (Map m : list) {
sb.append(m.get("id")).append(","); sb.append(m.get("id")).append(",");
} }
superDepts = StrKit.removeSuffix(sb.toString(), ","); subDepts = StrKit.removeSuffix(sb.toString(), ",");
} }
this.subDepts = subDepts; this.subDepts = subDepts;
@ -131,12 +127,12 @@ public class ShiroUser implements Serializable {
for (Map m : list) { for (Map m : list) {
sb.append(m.get("id")).append(","); sb.append(m.get("id")).append(",");
} }
superDepts = StrKit.removeSuffix(sb.toString(), ","); subRoles = StrKit.removeSuffix(sb.toString(), ",");
} }
this.subRoles = subRoles; this.subRoles = subRoles;
// 查找子角色对应账号id集合 // 查找子角色对应账号id集合
List<Map<String, Object>> listUser = CacheKit.get(ConstCache.SYS_CACHE, ConstCacheKey.USER_ALL_LIST, new ILoader() { /*List<Map<String, Object>> listUser = CacheKit.get(ConstCache.SYS_CACHE, ConstCacheKey.USER_ALL_LIST, new ILoader() {
@Override @Override
public Object load() { public Object load() {
return Db.selectList("SELECT * FROM blade_user where status = 1 and name is not null"); return Db.selectList("SELECT * FROM blade_user where status = 1 and name is not null");
@ -153,7 +149,7 @@ public class ShiroUser implements Serializable {
} }
} }
this.subUsers = StrKit.removeSuffix(sbUser.toString(), ","); this.subUsers = StrKit.removeSuffix(sbUser.toString(), ","); */
} }
public Object getId() { public Object getId() {