修复派工单子部门数据选择不到

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

@@ -21,7 +21,7 @@ public interface PeasantHouseholdMapper extends BaseMapper<PeasantHousehold> {
                                                       @Param("ownersName")String ownersName,
                                                       @Param("ids")String ids
     );
-    List<PeasantHousehold> selectPeasantHouseholdListsg(@Param("developerId") Long developerId,
+    List<PeasantHousehold> selectPeasantHouseholdListsg(@Param("unitInfoCode") String unitInfoCode,
                                                       @Param("regionalCompaniesSeq")Long regionalCompaniesSeq,
                                                       @Param("peasantHouseholdNo")String peasantHouseholdNo,
                                                       @Param("ownersName")String ownersName,

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

@@ -32,7 +32,7 @@ on hygf_document_station.preparation_money_id=hygf_preparation_money.sequence_nb
         FROM  hygf_peasant_household
         where
         hygf_peasant_household.construction_state='备货完成'
-        and hygf_peasant_household.developer_id=#{developerId}
+        and hygf_peasant_household.developer_id like concat('%',#{developerId},'%')
         and hygf_peasant_household.regional_companies_seq=#{regionalCompaniesSeq}
         and hygf_peasant_household.sequence_nbr not in (
         select hygf_work_order_power_station.peasant_household_id   from hygf_work_order_power_station

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

@@ -904,7 +904,7 @@ public ResponseModel< List<Map<String,Object>> > getRegionalCompanieByuser(
 
     ) {
         UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto( getUserInfo().getUserId());
-        return ResponseHelper.buildResponse(unitInfoServiceImpl.selectPeasantHouseholdListsg( userUnitInformationDto.getAmosDealerId(),regionalCompaniesSeq, current,size,peasantHouseholdNo,ownersName, ids));
+        return ResponseHelper.buildResponse(unitInfoServiceImpl.selectPeasantHouseholdListsg( userUnitInformationDto.getAmosDealerOrgCode(),regionalCompaniesSeq, current,size,peasantHouseholdNo,ownersName, ids));
     }
 
 }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/UnitInfoServiceImpl.java

@@ -1054,7 +1054,7 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
         pagenew.setRecords(page.getList());
         return pagenew;
     }
-    public Page<PeasantHousehold>  selectPeasantHouseholdListsg(  Long unitInfoId,
+    public Page<PeasantHousehold>  selectPeasantHouseholdListsg(  String unitInfoCode,
                                                              Long regionalCompaniesSeq,
                                                              int pageNum,
                                                              int pageSize,
@@ -1062,7 +1062,7 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
                                                              String ownersName,
                                                                   String ids){
         PageHelper.startPage(pageNum, pageSize);
-        List<PeasantHousehold>  list=peasantHouseholdMapper.selectPeasantHouseholdListsg(unitInfoId,regionalCompaniesSeq,peasantHouseholdNo,ownersName,ids);
+        List<PeasantHousehold>  list=peasantHouseholdMapper.selectPeasantHouseholdListsg(unitInfoCode,regionalCompaniesSeq,peasantHouseholdNo,ownersName,ids);
         PageInfo<PeasantHousehold> page = new PageInfo(list);
         Page<PeasantHousehold> pagenew = new Page<PeasantHousehold>();
         pagenew.setCurrent(pageNum);