修改org_code过滤

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

 package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
 
-import com.alibaba.fastjson.JSON;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
+
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
-import com.yeejoin.amos.boot.module.jxiop.api.entity.MapRegion;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.StationBasic;
 import com.yeejoin.amos.boot.module.jxiop.api.mapper.StationBasicMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.amosprojectentity.StdUserEmpower;
 import com.yeejoin.amos.boot.module.jxiop.biz.amosprojectmapper.UserEmpowerMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.service.IPermissionService;
-import org.apache.kafka.common.metrics.Stat;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
-import org.typroject.tyboot.core.foundation.context.RequestContext;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 @Service
 public class IPermissionServiceImpl implements IPermissionService {
 

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

@@ -77,7 +77,8 @@ public class IdxBizTableServiceImpl implements IIdxBizTableService {
      */
     @Override
     public List<Map<String, Object>> getSelectOptions(String tableName, String column, String valueColumn, String conditionColumn, String conditionValue, String isFx) {
-        List<String> permissions = permissionService.getCurrentUserPermissions();
+      //  List<String> permissions = permissionService.getCurrentUserPermissions();
+    	List<String> permissions = permissionService.getCurrentUserProjectOrgCodes();
         if (Objects.isNull(permissions)) {
             permissions = new ArrayList<>();
         }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizTableMapper.xml

@@ -22,7 +22,7 @@
             </if>
             <if test="gatewayIds != null">
                 <if test="gatewayIds.size() > 0">
-                    AND GATEWAY_ID IN
+                    AND ORG_CODE IN
                     <foreach collection="gatewayIds" item="item" open="(" separator="," close=")">
                         ${item}
                     </foreach>