修改筛选

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/TzBaseEnterpriseInfoServiceImpl.java

@@ -23,6 +23,9 @@ import com.yeejoin.amos.boot.module.tzs.api.service.ITzBaseEnterpriseInfoService
 import com.yeejoin.amos.boot.module.tzs.flc.api.dto.RegUnitIcDto;
 import com.yeejoin.amos.boot.module.tzs.flc.api.entity.RegUnitIc;
 import com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl.RegUnitIcServiceImpl;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.feign.privilege.Privilege;
+import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 
 /**
  * 企业数据信息 服务实现类
@@ -54,6 +57,13 @@ public class TzBaseEnterpriseInfoServiceImpl
 
 	@Override
 	public IPage<TzBaseEnterpriseInfoDto> page(PageParam pageParam, TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto) {
+		if (tzBaseEnterpriseInfoDto.getSuperviseKey() != null) {
+			FeignClientResult<CompanyModel> result = Privilege.companyClient
+					.seleteOne(Long.valueOf(tzBaseEnterpriseInfoDto.getSuperviseKey()));
+			if (result.getResult() != null) {
+				tzBaseEnterpriseInfoDto.setSuperviseOrgCode(result.getResult().getOrgCode());
+			}
+		}
 		Page<TzBaseEnterpriseInfoDto> page = new Page<>(pageParam.getCurrent(), pageParam.getSize());
 		return this.baseMapper.page(page, tzBaseEnterpriseInfoDto);
 	}
@@ -62,7 +72,9 @@ public class TzBaseEnterpriseInfoServiceImpl
 	public TzBaseEnterpriseInfoDto detail(Long id) {
 		TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto = new TzBaseEnterpriseInfoDto();
 		TzBaseEnterpriseInfo tzBaseEnterpriseInfo = this.getById(id);
-		BeanUtils.copyProperties(tzBaseEnterpriseInfo, tzBaseEnterpriseInfoDto);
+		if (tzBaseEnterpriseInfo != null) {
+			BeanUtils.copyProperties(tzBaseEnterpriseInfo, tzBaseEnterpriseInfoDto);
+		}
 		// 许可信息
 		List<BaseUnitLicence> unitLicences = baseUnitLicenceService.list(new LambdaQueryWrapper<BaseUnitLicence>()
 				.eq(BaseUnitLicence::getUnitCode, tzBaseEnterpriseInfo.getUseCode()));
@@ -77,7 +89,9 @@ public class TzBaseEnterpriseInfoServiceImpl
 		RegUnitIc regUnitIc = regUnitIcService.getOne(
 				new LambdaQueryWrapper<RegUnitIc>().eq(RegUnitIc::getUnitCode, tzBaseEnterpriseInfo.getUseCode()));
 		RegUnitIcDto regUnitIcDto = new RegUnitIcDto();
-		BeanUtils.copyProperties(regUnitIc, regUnitIcDto);
+		if (regUnitIc != null) {
+			BeanUtils.copyProperties(regUnitIc, regUnitIcDto);
+		}
 		tzBaseEnterpriseInfoDto.setRegUnitIcDto(regUnitIcDto);
 		return tzBaseEnterpriseInfoDto;
 	}