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/config/UserEmpowerInterceptor.java

@@ -48,7 +48,7 @@ public class UserEmpowerInterceptor implements Interceptor {
             try {
                 StdUserEmpower orgCode =(StdUserEmpower) redisUtils.get("Emp_"+RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken()));
 
-                if(orgCode!=null&& orgCode.isFlag()){
+                if(orgCode!=null&& orgCode.isFlag()&&!orgCode.isFarmer()){
                     StatementHandler statementHandler = PluginUtils.realTarget(invocation.getTarget());
                     MetaObject metaObject = SystemMetaObject.forObject(statementHandler);
                     MappedStatement mappedStatement = (MappedStatement) metaObject.getValue("delegate.mappedStatement");

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

@@ -49,6 +49,7 @@ public class UserLimitsAdvice {
 
     private static final String ROLEFLAG="-经销商-";
 
+    private static final String FARMER="-农户";
     private static final String ROLEFLAGADMIN="-经销商-管理员";
 
     private static final String ROLEFLDEVELOP="-经销商-开发";
@@ -84,6 +85,11 @@ public class UserLimitsAdvice {
             }else if (org.contains(ROLEFLDEVELOP)){
                 stdUserEmpower.setUserId(userid);
             }
+        }else if(org.contains(FARMER)){
+             //农户暂不做需求
+            stdUserEmpower.setFarmer(true);
+
+
         }else{
             LambdaQueryWrapper<StdUserEmpower> qu=new LambdaQueryWrapper();
             qu.eq(StdUserEmpower::getAmosUserId,userid);

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/StdUserEmpower.java

@@ -73,4 +73,9 @@ public class StdUserEmpower extends BaseEntity {
     //经销商管理员区域公司orgcode
     @TableField(exist = false)
     private String adminRegionalCompaniesCode;
+
+
+    //是否农户
+    @TableField(exist = false)
+    private boolean farmer;
 }

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

@@ -26,7 +26,7 @@ public interface JpStationMapper extends BaseMapper<JpStation> {
     List<Map<String,Double>> getPowerqx(String dateType);
 
     //@DealerRestrict(field ={"amos_company_code","regional_companies_code","developer_user_id"} ,fieldConditions ={"in","in","in"} ,relationship="and")
-    @UserEmpower(field ={"hygf_jp_station.regional_companies_code"} ,fieldConditions ={"in"} ,relationship="and")
+    @UserEmpower(field ={"hygf_jp_station.regional_companies_code"},dealerField ={"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);

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

@@ -32,7 +32,7 @@ public interface MaintenanceMapper extends BaseMapper<Maintenance> {
     public Integer selectMaintenance(@Param("telephone")String telephone,@Param("adminLoginName")String adminLoginName);
 
     //列表
-    @UserEmpower(field ={"ph.regional_companies_code"} ,fieldConditions ={"in"} ,relationship="and")
+   // @UserEmpower(field ={"ph.regional_companies_code"} ,fieldConditions ={"in"} ,relationship="and")
     List<MaintenanceDto> Maintenancepage(@Param("name")String name, @Param("maintenanceTypeCode")String maintenanceTypeCode,
                                          @Param("lockStatus")String lockStatus, @Param("reviewStatus")String reviewStatus,
                                          @Param("regionalCompaniesSeq")Long regionalCompaniesSeq, @Param("dealerId") Long dealerId,@Param("maintenanceType")String maintenanceType,

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/MaintenanceController.java

@@ -113,7 +113,6 @@ public class MaintenanceController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/page")
     @ApiOperation(httpMethod = "GET",value = "运维人员分页查询",  notes = "运维人员分页查询")
-    @UserLimits
     public ResponseModel<Page<MaintenanceDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
             (value = "size") int size,
                                                          @RequestParam(required = false) String name,