解决冲突

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/config/UserEmpowerInterceptor.java

@@ -349,6 +349,47 @@ public class UserEmpowerInterceptor implements Interceptor {
         }
         return sql;
     }
+
+    private String getConditionJXS(String filed,String type, List<String> data){
+        String sql=" ";
+        switch (type) {
+            case "in":
+                sql = sql+getInDataJXS( filed,data);
+                break;
+            case "like":
+                if(data.size()==1){
+                    sql = sql+getlikeData(filed,data);
+                }else{
+
+                }
+                break;
+            case "likeLeft":
+                if(data.size()==1){
+                    sql = sql+getlikeLeftData(filed,data);
+                }else{
+
+                }
+
+                break;
+            case "likeRight":
+
+                if(data.size()==1){
+                    sql = sql+getlikeRightData(filed,data);
+                }else{
+
+                }
+                break;
+            case "eq":
+
+                if(data.size()==1){
+                    sql = sql+getData(filed,data);
+                }else{
+                    sql = sql+getData(filed,data);
+                }
+                break;
+        }
+        return sql;
+    }
     private String getInData( String filed,List<String> data){
         String sql=" ( ";
         for (int i = 0; i < data.size(); i++) {
@@ -361,6 +402,21 @@ public class UserEmpowerInterceptor implements Interceptor {
         return filed+" in "+sql;
     }
 
+    private String getInDataJXS( String filed,List<String> data){
+
+        List<String> list = Arrays.asList(data.get(0).split(","));
+        String sql=" ( ";
+        for (int i = 0; i < list.size(); i++) {
+            if(i==list.size()-1){
+                sql=sql+"'" +list.get(i)+"' ) ";
+            }else{
+                sql=sql+"'"+ list.get(i)+"',";
+            }
+        }
+        return filed+" in "+sql;
+    }
+
+
     private String getnotInData( String filed,List<String> data){
         String sql=" ( ";
         for (int i = 0; i < data.size(); i++) {
@@ -475,7 +531,7 @@ public class UserEmpowerInterceptor implements Interceptor {
 
             for (int i = 0; i < filed.length; i++) {
                 String sq = " ";
-                sq = getCondition(filed[i], fileCondition[i], Arrays.asList(data.get(i)));
+                sq = getConditionJXS(filed[i], fileCondition[i], Arrays.asList(data.get(i)));
                 sql.add(sq);
             }
         }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/RegionalCompaniesMapper.java

@@ -20,6 +20,6 @@ public interface RegionalCompaniesMapper extends BaseMapper<RegionalCompanies> {
 
     RegionalCompanies selectRegionName(@Param("sequenceNbr")Long sequenceNbr);
 
-    @UserEmpower(field ={"hygf_regional_companies.regional_companies_code"} ,fieldConditions ={"in"} ,relationship="and")
+    @UserEmpower(field ={"hygf_regional_companies.regional_companies_code"} ,dealerField ={"hygf_unit_info.amos_company_code","hygf_regional_companies.regional_companies_code"},fieldConditions ={"eq","in"} ,relationship="and")
     List<RegionalCompanies>  selectListRegionalCompanies(@Param("sequenceNbr")Long sequenceNbr);
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/UnitInfoMapper.java

@@ -26,7 +26,7 @@ public interface UnitInfoMapper extends BaseMapper<UnitInfo> {
     List< Map<String,Object>> getuserList(@Param("userName") String userName,@Param("role") Long role,@Param("regionalCompaniesSeq") Long regionalCompaniesSeq,@Param("amosUnitId") Long amosUnitId);
     List< Map<String,Object>> getuserListtelephone(@Param("userName") String userName,@Param("role") Long role,@Param("regionalCompaniesSeq") Long regionalCompaniesSeq,@Param("amosUnitId") Long amosUnitId);
 
-    @UserEmpower(field ={"hygf_regional_companies.regional_companies_code"} ,fieldConditions ={"in"} ,relationship="and")
+    @UserEmpower(field ={"hygf_regional_companies.regional_companies_code"} ,dealerField ={"hygf_unit_info.amos_company_code","hygf_regional_companies.regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
     List<UnitInfo>   getlistUnitInfo();
 
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/RegionalCompaniesMapper.xml

@@ -91,8 +91,9 @@
 
     <select id="selectListRegionalCompanies" resultType="com.yeejoin.amos.boot.module.hygf.api.entity.RegionalCompanies">
 
-select * from   hygf_regional_companies where hygf_regional_companies.is_delete=0
-
+select * from   hygf_regional_companies
+    Left JOIN  hygf_unit_info on hygf_unit_info.sequence_nbr = hygf_regional_companies.unit_info_id
+where hygf_regional_companies.is_delete=0
  and  hygf_regional_companies.unit_info_id=#{sequenceNbr}
     </select>
 </mapper>