修改权限

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

@@ -13,6 +13,6 @@ import java.util.List;
  * @createDate: 2023/8/1
  */
 public interface DealerReviewMapper extends BaseMapper<DealerReview> {
-    @UserEmpower(field ={"ph.regional_companies_code"} ,fieldConditions ={"in"} ,relationship="and")
+//    @UserEmpower(field ={"ph.regional_companies_code"} ,fieldConditions ={"in"} ,relationship="and")
     List<ReviewDto> queryForDealerReviewPage(ReviewDto reviewDto);
 }

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

 package com.yeejoin.amos.boot.module.hygf.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
 import com.yeejoin.amos.boot.module.hygf.api.entity.RegionalCompanies;
 import org.apache.ibatis.annotations.Param;
 
@@ -18,4 +19,7 @@ public interface RegionalCompaniesMapper extends BaseMapper<RegionalCompanies> {
     RegionalCompanies selectByid(@Param("sequenceNbr")Long sequenceNbr);
 
     RegionalCompanies selectRegionName(@Param("sequenceNbr")Long sequenceNbr);
+
+    @UserEmpower(field ={"hygf_regional_companies.regional_companies_code"} ,fieldConditions ={"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

 package com.yeejoin.amos.boot.module.hygf.api.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
 import com.yeejoin.amos.boot.module.hygf.api.dto.CompanyDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.UnitInfo;
 import org.apache.ibatis.annotations.Param;
@@ -23,5 +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")
+    List<UnitInfo>   getlistUnitInfo();
 
 }

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

@@ -86,4 +86,11 @@
         from privilege_company where privilege_company.SEQUENCE_NBR=#{sequenceNbr}
 
     </select>
+
+
+
+    <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 and  hygf_regional_companies.unit_info_id={sequenceNbr}
+    </select>
 </mapper>

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

@@ -90,4 +90,13 @@ from  privilege_company  where IS_DELETED=0 and AGENCY_CODE='JXIOP'
     </select>
 
 
+    <select id="getlistUnitInfo" resultType="com.yeejoin.amos.boot.module.hygf.api.entity.UnitInfo">
+
+    select  hygf_unit_info.* from hygf_unit_info left
+    JOIN  hygf_regional_companies on  hygf_regional_companies.unit_info_id=hygf_unit_info.sequence_nbr
+    where hygf_unit_info.is_delete=0 and hygf_unit_info.audit_status=2
+    GROUP BY hygf_unit_info.sequence_nbr
+
+    </select>
+
 </mapper>

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

@@ -182,7 +182,6 @@ public class UnitInfoController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/queryForDealerReviewPage")
     @ApiOperation(httpMethod = "GET",value = "经销商人员信息分页查询",  notes = "经销商人员信息分页查询")
-    @UserLimits
     public ResponseModel<Page<ReviewDto>> queryForDealerReviewPage(@RequestParam(value = "current") int current, @RequestParam
             (value = "size") int size,  ReviewDto reviewDto) {
         Page<ReviewDto> page=dealerReviewServiceImpl.queryForDealerReviewPage(current,size,reviewDto);
@@ -671,25 +670,31 @@ public class UnitInfoController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET",value = "获取审核通过的经销商",   notes = "获取审核通过的经销商")
     @GetMapping(value = "/getlistUnitInfo")
+    @UserLimits
     public ResponseModel<List<UnitInfo>> getlistUnitInfo() {
 
-       LambdaQueryWrapper<UnitInfo> qu=new LambdaQueryWrapper();
-        qu.eq(UnitInfo::getIsDelete,false);
-        qu.eq(UnitInfo::getAuditStatus,2);
-        List<UnitInfo> list=unitInfoMapper.selectList(qu);
+//       LambdaQueryWrapper<UnitInfo> qu=new LambdaQueryWrapper();
+//        qu.eq(UnitInfo::getIsDelete,false);
+//        qu.eq(UnitInfo::getAuditStatus,2);
+ //       List<UnitInfo> list=unitInfoMapper.selectList(qu);
+
+        List<UnitInfo> list=unitInfoMapper.getlistUnitInfo();
         return ResponseHelper.buildResponse(list);
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
     @GetMapping(value = "/getRegionalCompanie")
+    @UserLimits
     public ResponseModel< List<RegionalCompanies> > getRegionalCompanie(
             @RequestParam(required=false) Long sequenceNbr
     ) {
-       LambdaQueryWrapper<RegionalCompanies> qu=new LambdaQueryWrapper();
-        qu.eq(RegionalCompanies::getUnitInfoId,sequenceNbr);
-        qu.eq(RegionalCompanies::getIsDelete,false);
-        List<RegionalCompanies>  list=regionalCompaniesMapper.selectList(qu);
+//       LambdaQueryWrapper<RegionalCompanies> qu=new LambdaQueryWrapper();
+//        qu.eq(RegionalCompanies::getUnitInfoId,sequenceNbr);
+//        qu.eq(RegionalCompanies::getIsDelete,false);
+//        List<RegionalCompanies>  list=regionalCompaniesMapper.selectList(qu);
+
+        List<RegionalCompanies>  list=regionalCompaniesMapper.selectListRegionalCompanies(sequenceNbr);
         return ResponseHelper.buildResponse(list);
     }