feature-wzb :公积金表格修改

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java

@@ -6691,21 +6691,20 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 	public List<List<String>> headSecond(String houseName,SocialHandleSearchVo searchVo) {
 		List<List<String>> list = new ArrayList<>();
 		//表头数据
+		String a=null;
 		if(houseName!=null) {
-			CompanyProVo companyProVo = companyProVo(houseName,searchVo);
-            HouseNameConfigVo vo =getFundSumExportVoTwo(houseName,searchVo);
-
-			if(vo.getCustomerNo()==null){
-			vo.setCustomerNo("");
-
-			}
-
-			if(vo.getCompanyPro()==null){
-				vo.setCompanyPro("");
-
+			HouseNameConfigVo vo = getFundSumExportVoTwo(houseName, searchVo);
+			if (vo == null) {
+				a = "单位名称(签章): " + "" + "         单位公积金账号:" + "" + "      单边缴纳比例:" + ""  ;
+			} else {
+				a = "单位名称(签章): " + houseName + "         单位公积金账号:" + vo.getCustomerNo() + "      单边缴纳比例:" + vo.getCompanyPro() + "%";
+				if (vo.getCustomerNo() == null) {
+					vo.setCustomerNo("");
+				}
+				if (vo.getCompanyPro() == null) {
+					vo.setCompanyPro("");
+				}
 			}
-			String a = "单位名称(签章): " + houseName + "         单位公积金账号:" + vo.getCustomerNo() + "      单边缴纳比例:" + vo.getCompanyPro()+"%";
-
 			//第一列-第十八列
 			for (int i = 1; i <= 8; i++) {
 				list.add(Lists.newArrayList(a));