权限修改 电站监控各列表

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

@@ -23,7 +23,7 @@ public interface JpInverterMapper extends BaseMapper<JpInverter> {
     List<Map<String,Object>> queryInverterCountStatus(@Param("dto") JpStationDto reviewDto);
 
     //@UserEmpower(field ={"regional_companies_code","amos_company_code"} ,fieldConditions ={"in","in"} ,relationship="and")
-    @DealerRestrict(field ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"in"} ,relationship="and")
+    @DealerRestrict(field ={"amos_company_code","regional_companies_code","developer_user_id"},fieldConditions ={"in","in","in"} ,relationship="and")
     List<JpInverterDtoNew> selectPageData(@Param("dto") JpInverterDto reviewDto, int current, int size);
 
     //@UserEmpower(field ={"regional_companies_code","amos_company_code"} ,fieldConditions ={"in","in"} ,relationship="and")

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

@@ -25,7 +25,7 @@ public interface JpStationMapper extends BaseMapper<JpStation> {
     List<Map<String,Object>>  countState(@Param("dto") JpStationDto reviewDto);
     List<Map<String,Double>> getPowerqx(String dateType);
 
-    //@UserEmpower(field ={"regional_companies_code","amos_company_code"} ,fieldConditions ={"in","in"} ,relationship="and")
+    @DealerRestrict(field ={"amos_company_code","regional_companies_code","developer_user_id"} ,fieldConditions ={"in","in","in"} ,relationship="and")
     List<JpStation> getJpStation(@Param("dto") JpStationDto reviewDto);
 
     List<JpStation> getJpStationList(@Param("dto") JpStationDto reviewDto);
@@ -56,7 +56,7 @@ public interface JpStationMapper extends BaseMapper<JpStation> {
 
    // @UserEmpower(field ={"regional_companies_code","amos_company_code"} ,fieldConditions ={"in","in"} ,relationship="and")
    @UserLimits
-   @DealerRestrict(field ={"amos_company_code","regional_companies_code","developer_user_id"} ,fieldConditions ={"in","in"} ,relationship="and")
+   @DealerRestrict(field ={"amos_company_code","regional_companies_code","developer_user_id"} ,fieldConditions ={"in","in","in"} ,relationship="and")
    List<JpStationDto> queryForDealerReviewPagenew(@Param("dto") JpStationDto reviewDto, Page<JpStationDto> pa);
 
     List<DropDown>  getDealerNew(@Param("regionalCompaniesSeq") String regionalCompaniesSeq);

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

@@ -76,6 +76,8 @@
         from
         hygf_jp_inverter  hjc
         left join hygf_jp_station sta on sta.third_station_id = hjc.third_station_id
+        LEFT JOIN
+        (select developer_user_id,developer_code FROM  hygf_peasant_household ) php  ON php.developer_code= sta.amos_company_code
         <where>
             <if test="dto.snCode != null and dto.snCode != ''">
                 AND  hjc.sn_code like #{dto.snCode}

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

@@ -163,7 +163,8 @@
         select
         *
         from hygf_jp_station
-
+        LEFT JOIN
+        (select developer_user_id,developer_code FROM  hygf_peasant_household ) php  ON php.developer_code= hygf_jp_station.amos_company_code
         <where>
             is_delete=0
             <if test="dto.name!=null">