修复权限树不正确

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/service/IPermissionService.java

@@ -6,4 +6,5 @@ import java.util.List;
 public interface IPermissionService {
     List<String> getCurrentUserPermissions();
     List<String> getCurrentUserProjectOrgCodes();
+    List<String> getCurrentUserAmosOrgCodes();
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/IPermissionServiceImpl.java

@@ -16,6 +16,7 @@ import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -23,74 +24,103 @@ import java.util.stream.Collectors;
 @Service
 public class IPermissionServiceImpl implements IPermissionService {
 
-    @Autowired
-    private RedisUtils redisUtils;
+	@Autowired
+	private RedisUtils redisUtils;
 
-    @Autowired
-    private UserEmpowerMapper userEmpowerMapper;
+	@Autowired
+	private UserEmpowerMapper userEmpowerMapper;
 
-    @Autowired
-    private StationBasicMapper stationBasicMapper;
+	@Autowired
+	private StationBasicMapper stationBasicMapper;
 
-    @Override
-    public List<String> getCurrentUserPermissions() {
-        List<String> result = new ArrayList<>();
-        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
-        String userId = reginParams.getUserModel().getUserId();
-        StdUserEmpower stdUserEmpower = userEmpowerMapper.selectOne(new QueryWrapper<StdUserEmpower>().eq("amos_user_id", userId).eq("permission_type", "YTH"));
-        if (ObjectUtils.isEmpty(stdUserEmpower)) {
-            return null;
-        } else {
-            String permissionOrgCode = stdUserEmpower.getAmosOrgCode().get(0);
-            Map<String, String> companyInfo = userEmpowerMapper.getCompanyInfoByOrgCode(permissionOrgCode);
-            String companyLevel = companyInfo.get("level");
-            if (companyLevel.equals("categroy_leve2")) {
-                List<StationBasic> stationBasics = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().like("project_org_code", permissionOrgCode));
-                result = stationBasics.stream().map(StationBasic::getFanGatewayId).collect(Collectors.toList());
-                return result;
-            }
-            if (companyLevel.equals("area")) {
-                List<StationBasic> stationBasics = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().like("project_org_code", permissionOrgCode));
-                result = stationBasics.stream().map(StationBasic::getFanGatewayId).collect(Collectors.toList());
-                return result;
-            }
-            if (companyLevel.equals("station")) {
-                StationBasic stationBasic = stationBasicMapper.selectOne(new QueryWrapper<StationBasic>().eq("project_org_code", permissionOrgCode));
-                result.add(stationBasic.getFanGatewayId());
-                return result;
-            }
-        }
-        return result;
-    }
+	@Override
+	public List<String> getCurrentUserPermissions() {
+		List<String> result = new ArrayList<>();
+		ReginParams reginParams = JSONObject.parseObject(redisUtils
+				.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(),
+				ReginParams.class);
+		String userId = reginParams.getUserModel().getUserId();
+		StdUserEmpower stdUserEmpower = userEmpowerMapper
+				.selectOne(new QueryWrapper<StdUserEmpower>().eq("amos_user_id", userId).eq("permission_type", "YTH"));
+		if (ObjectUtils.isEmpty(stdUserEmpower)) {
+			return null;
+		} else {
+			String permissionOrgCode = stdUserEmpower.getAmosOrgCode().get(0);
+			Map<String, String> companyInfo = userEmpowerMapper.getCompanyInfoByOrgCode(permissionOrgCode);
+			String companyLevel = companyInfo.get("level");
+			if (companyLevel.equals("categroy_leve2")) {
+				List<StationBasic> stationBasics = stationBasicMapper
+						.selectList(new QueryWrapper<StationBasic>().like("project_org_code", permissionOrgCode));
+				result = stationBasics.stream().map(StationBasic::getFanGatewayId).collect(Collectors.toList());
+				return result;
+			}
+			if (companyLevel.equals("area")) {
+				List<StationBasic> stationBasics = stationBasicMapper
+						.selectList(new QueryWrapper<StationBasic>().like("project_org_code", permissionOrgCode));
+				result = stationBasics.stream().map(StationBasic::getFanGatewayId).collect(Collectors.toList());
+				return result;
+			}
+			if (companyLevel.equals("station")) {
+				StationBasic stationBasic = stationBasicMapper
+						.selectOne(new QueryWrapper<StationBasic>().eq("project_org_code", permissionOrgCode));
+				result.add(stationBasic.getFanGatewayId());
+				return result;
+			}
+		}
+		return result;
+	}
 
-    @Override
-    public List<String> getCurrentUserProjectOrgCodes() {
-        List<String> result = new ArrayList<>();
-        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
-        String userId = reginParams.getUserModel().getUserId();
-        StdUserEmpower stdUserEmpower = userEmpowerMapper.selectOne(new QueryWrapper<StdUserEmpower>().eq("amos_user_id", userId).eq("permission_type", "YTH"));
-        if (ObjectUtils.isEmpty(stdUserEmpower)) {
-            return null;
-        } else {
-            String permissionOrgCode = stdUserEmpower.getAmosOrgCode().get(0);
-            Map<String, String> companyInfo = userEmpowerMapper.getCompanyInfoByOrgCode(permissionOrgCode);
-            String companyLevel = companyInfo.get("level");
-            if (companyLevel.equals("categroy_leve2")) {
-            	List<StationBasic> stationBasics = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().like("project_org_code", permissionOrgCode));
-                result = stationBasics.stream().map(StationBasic::getProjectOrgCode).collect(Collectors.toList());
-                return result;
-            }
-            if (companyLevel.equals("area")) {
-                List<StationBasic> stationBasics = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().like("project_org_code", permissionOrgCode));
-                result = stationBasics.stream().map(StationBasic::getProjectOrgCode).collect(Collectors.toList());
-                return result;
-            }
-            if (companyLevel.equals("station")) {
-                StationBasic stationBasic = stationBasicMapper.selectOne(new QueryWrapper<StationBasic>().eq("project_org_code", permissionOrgCode));
-                result.add(stationBasic.getProjectOrgCode());
-                return result;
-            }
-        }
-        return result;
-    }
+	@Override
+	public List<String> getCurrentUserProjectOrgCodes() {
+		List<String> result = new ArrayList<>();
+		ReginParams reginParams = JSONObject.parseObject(redisUtils
+				.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(),
+				ReginParams.class);
+		String userId = reginParams.getUserModel().getUserId();
+		StdUserEmpower stdUserEmpower = userEmpowerMapper
+				.selectOne(new QueryWrapper<StdUserEmpower>().eq("amos_user_id", userId).eq("permission_type", "YTH"));
+		if (ObjectUtils.isEmpty(stdUserEmpower)) {
+			return null;
+		} else {
+			String permissionOrgCode = stdUserEmpower.getAmosOrgCode().get(0);
+			Map<String, String> companyInfo = userEmpowerMapper.getCompanyInfoByOrgCode(permissionOrgCode);
+			String companyLevel = companyInfo.get("level");
+			if (companyLevel.equals("categroy_leve2")) {
+				List<StationBasic> stationBasics = stationBasicMapper
+						.selectList(new QueryWrapper<StationBasic>().like("project_org_code", permissionOrgCode));
+				result = stationBasics.stream().map(StationBasic::getProjectOrgCode).collect(Collectors.toList());
+				return result;
+			}
+			if (companyLevel.equals("area")) {
+				List<StationBasic> stationBasics = stationBasicMapper
+						.selectList(new QueryWrapper<StationBasic>().like("project_org_code", permissionOrgCode));
+				result = stationBasics.stream().map(StationBasic::getProjectOrgCode).collect(Collectors.toList());
+				return result;
+			}
+			if (companyLevel.equals("station")) {
+				StationBasic stationBasic = stationBasicMapper
+						.selectOne(new QueryWrapper<StationBasic>().eq("project_org_code", permissionOrgCode));
+				result.add(stationBasic.getProjectOrgCode());
+				return result;
+			}
+		}
+		return result;
+	}
+
+	@Override
+	public List<String> getCurrentUserAmosOrgCodes() {
+		List<String> result = new ArrayList<>();
+		ReginParams reginParams = JSONObject.parseObject(redisUtils
+				.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(),
+				ReginParams.class);
+		String userId = reginParams.getUserModel().getUserId();
+		StdUserEmpower stdUserEmpower = userEmpowerMapper
+				.selectOne(new QueryWrapper<StdUserEmpower>().eq("amos_user_id", userId).eq("permission_type", "YTH"));
+		if (ObjectUtils.isEmpty(stdUserEmpower)) {
+			return new ArrayList<>();
+		} else {
+			return stdUserEmpower.getAmosOrgCode() != null ? Arrays.asList(stdUserEmpower.getAmosOrgCode().get(0))
+					: new ArrayList<>();
+		}
+	}
 }