权限修改

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>