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/HouseholdContractMapper.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.entity.HouseholdContract;
+import org.apache.ibatis.annotations.Param;
 
 /**
  *  Mapper 接口
@@ -11,4 +16,6 @@ import com.yeejoin.amos.boot.module.hygf.api.entity.HouseholdContract;
  */
 public interface HouseholdContractMapper extends BaseMapper<HouseholdContract> {
 
+    @UserEmpower(field ={"regional_companies_code"} ,fieldConditions ={"in"} ,relationship="and")
+    IPage<HouseholdContract> selectPage(IPage<HouseholdContract> page, @Param(Constants.WRAPPER) Wrapper<HouseholdContract> queryWrapper);
 }

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.HouseholdContractEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.TaskTypeStationEnum;
+import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
 import com.yeejoin.amos.boot.module.hygf.api.dto.HouseholdContractDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.HouseholdContractPageDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.UserUnitInformationDto;
@@ -151,15 +152,16 @@ public class HouseholdContractController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/page")
 	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+    @UserLimits
 	public ResponseModel<IPage< HouseholdContract > > queryForPage(HouseholdContractPageDto dto) {
 
 
-        //获取用户所在经销商单位
-        UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto(getUserId());
-
-         if(userUnitInformationDto!=null&&userUnitInformationDto.getAmosDealerId()!=null){
-             dto.setDealerId(userUnitInformationDto.getAmosDealerId());
-         }
+//        //获取用户所在经销商单位
+//        UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto(getUserId());
+//
+//         if(userUnitInformationDto!=null&&userUnitInformationDto.getAmosDealerId()!=null){
+//             dto.setDealerId(userUnitInformationDto.getAmosDealerId());
+//         }
 
         return ResponseHelper.buildResponse(householdContractServiceImpl.queryForPreparationMoneyPage(dto));
 	}