Merge remote-tracking branch 'origin/dev0124' into dev0124

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

@@ -20,9 +20,9 @@ public interface JpCollectorMapper extends BaseMapper<JpCollector> {
    List<Map<String,Object>>  queryCollectorCountStatus(@Param("dto") JpStationDto reviewDto);
 
 
-   @UserEmpower(field ={"sta.regional_companies_code"} ,fieldConditions ={"in"} ,relationship="and")
+   @UserEmpower(field ={"sta.regional_companies_code"} ,dealerField = {"regional_companies_code","amos_company_code"},fieldConditions ={"in","in"} ,relationship="and")
    List<JpCollectorDto>  selectPageData(@Param("dto") JpCollectorDto reviewDto, Integer current, Integer size);
 
-   @UserEmpower(field ={"sta.regional_companies_code"} ,fieldConditions ={"in"} ,relationship="and")
+   @UserEmpower(field ={"sta.regional_companies_code"} ,dealerField = {"regional_companies_code","amos_company_code"},fieldConditions ={"in","in"} ,relationship="and")
    int  selectPageDataTota(@Param("dto") JpCollectorDto reviewDto);
 }