diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzThpjb/controller/KcZzThpjbController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzThpjb/controller/KcZzThpjbController.java
index 33994a7d..e781eceb 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzThpjb/controller/KcZzThpjbController.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzThpjb/controller/KcZzThpjbController.java
@@ -229,12 +229,14 @@ public class KcZzThpjbController extends JeecgController<KcZzThpjb, IKcZzThpjbSe
 				for(int i=0;i<list.size();i++){
 					KcZzThpjb KcZzThpjbPar = list.get(i);
 					QueryWrapper<KcZzThpjb> queryWrapper = new QueryWrapper<>();
-					queryWrapper.eq(StringUtils.isNotBlank(KcZzThpjbPar.getKcbh()),"kcbh",KcZzThpjbPar.getKcbh());
-					queryWrapper.eq(StringUtils.isNotBlank(KcZzThpjbPar.getKcmc()),"kcmc",KcZzThpjbPar.getKcmc());
-					queryWrapper.eq(StringUtils.isNotBlank(KcZzThpjbPar.getSkjs()),"skjs",KcZzThpjbPar.getSkjs());
-					queryWrapper.eq(StringUtils.isNotBlank(KcZzThpjbPar.getSkdd()),"skdd",KcZzThpjbPar.getSkdd());
+					queryWrapper.eq("kcbh",KcZzThpjbPar.getKcbh());
+					queryWrapper.eq("kcmc",KcZzThpjbPar.getKcmc());
+					queryWrapper.eq("skjs",KcZzThpjbPar.getSkjs());
+					queryWrapper.eq("skdd",KcZzThpjbPar.getSkdd());
 					queryWrapper.eq("sksj",KcZzThpjbPar.getSksj());
 					queryWrapper.eq("pjsj",KcZzThpjbPar.getPjsj());
+					queryWrapper.eq("pkjsbh",KcZzThpjbPar.getPkjsbh());
+					queryWrapper.eq("pkjsxm",KcZzThpjbPar.getPkjsxm());
 					List<KcZzThpjb> listPar = kcZzThpjbService.list(queryWrapper);
 					if(listPar!=null&&listPar.size()>0){
 						errNum++;
@@ -242,11 +244,11 @@ public class KcZzThpjbController extends JeecgController<KcZzThpjb, IKcZzThpjbSe
 						errorRest += "数据重复："+KcZzThpjbPar.getKcbh()+"-"+KcZzThpjbPar.getKcmc()+"-"+KcZzThpjbPar.getSkjs()+"-"+KcZzThpjbPar.getSkdd()+"-"+"<br/>";
 					}else{
 						QueryWrapper<KcKetangbiao> kcKetangbiaoQueryWrapper = new QueryWrapper<>();
-						kcKetangbiaoQueryWrapper.eq(StringUtils.isNotBlank(KcZzThpjbPar.getKcbh()),"kcbh",KcZzThpjbPar.getKcbh());
-						kcKetangbiaoQueryWrapper.eq(StringUtils.isNotBlank(KcZzThpjbPar.getKcmc()),"kcmc",KcZzThpjbPar.getKcmc());
-						kcKetangbiaoQueryWrapper.eq(StringUtils.isNotBlank(KcZzThpjbPar.getSkjs()),"skjs",KcZzThpjbPar.getSkjs());
-						kcKetangbiaoQueryWrapper.eq(StringUtils.isNotBlank(KcZzThpjbPar.getSkdd()),"skdd",KcZzThpjbPar.getSkdd());
-						kcKetangbiaoQueryWrapper.like("skrq", DateUtil.format(KcZzThpjbPar.getSksj(),"yyyy-MM-dd"));
+						kcKetangbiaoQueryWrapper.eq("kcbh",KcZzThpjbPar.getKcbh());
+						kcKetangbiaoQueryWrapper.eq("kcmc",KcZzThpjbPar.getKcmc());
+						kcKetangbiaoQueryWrapper.eq("skjs",KcZzThpjbPar.getSkjs());
+						kcKetangbiaoQueryWrapper.eq("skdd",KcZzThpjbPar.getSkdd());
+						kcKetangbiaoQueryWrapper.eq("skrq", DateUtil.format(KcZzThpjbPar.getSksj(),"yyyy-MM-dd"));
 						List<KcKetangbiao> kcKetangBiaoList = kcKetangbiaoService.list(kcKetangbiaoQueryWrapper);
 						if(kcKetangBiaoList!=null && kcKetangBiaoList.size()>0){
 							KcKetangbiao KcKetangbiao = kcKetangBiaoList.get(0);
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzYbtkb/controller/KcZzYbtkbController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzYbtkb/controller/KcZzYbtkbController.java
index f2c87f29..fb5693b1 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzYbtkb/controller/KcZzYbtkbController.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzYbtkb/controller/KcZzYbtkbController.java
@@ -230,13 +230,13 @@ public class KcZzYbtkbController extends JeecgController<KcZzYbtkb, IKcZzYbtkbSe
 				for(int i=0;i<list.size();i++){
 					KcZzYbtkb KcZzYbtkbPar = list.get(i);
 					QueryWrapper<KcZzYbtkb> queryWrapper = new QueryWrapper<>();
-					queryWrapper.eq(StringUtils.isNotBlank(KcZzYbtkbPar.getKcbh()),"kcbh",KcZzYbtkbPar.getKcbh());
-					queryWrapper.eq(StringUtils.isNotBlank(KcZzYbtkbPar.getKcmc()),"kcmc",KcZzYbtkbPar.getKcmc());
-					queryWrapper.eq(StringUtils.isNotBlank(KcZzYbtkbPar.getSkjs()),"skjs",KcZzYbtkbPar.getSkjs());
-					queryWrapper.eq(StringUtils.isNotBlank(KcZzYbtkbPar.getSkdd()),"skdd",KcZzYbtkbPar.getSkdd());
+					queryWrapper.eq("kcbh",KcZzYbtkbPar.getKcbh());
+					queryWrapper.eq("kcmc",KcZzYbtkbPar.getKcmc());
+					queryWrapper.eq("skjs",KcZzYbtkbPar.getSkjs());
+					queryWrapper.eq("skdd",KcZzYbtkbPar.getSkdd());
 					queryWrapper.eq("skrq",KcZzYbtkbPar.getSkrq());
-					queryWrapper.eq(StringUtils.isNotBlank(KcZzYbtkbPar.getTkjsbh()),"tkjsbh",KcZzYbtkbPar.getTkjsbh());
-					queryWrapper.eq(StringUtils.isNotBlank(KcZzYbtkbPar.getTkjsxm()),"tkjsxm",KcZzYbtkbPar.getTkjsxm());
+					queryWrapper.eq("tkjsbh",KcZzYbtkbPar.getTkjsbh());
+					queryWrapper.eq("tkjsxm",KcZzYbtkbPar.getTkjsxm());
 					queryWrapper.like("pksj",DateUtil.format(KcZzYbtkbPar.getPksj(),"yyyy-MM-dd"));
 					List<KcZzYbtkb> listPar = kcZzYbtkbService.list(queryWrapper);
 					if(listPar!=null&&listPar.size()>0){
@@ -245,10 +245,10 @@ public class KcZzYbtkbController extends JeecgController<KcZzYbtkb, IKcZzYbtkbSe
 						errorRest += "已经导入（重复数据）："+KcZzYbtkbPar.getKcmc()+"-"+KcZzYbtkbPar.getSkjs()+"-"+KcZzYbtkbPar.getSkdd()+"-"+KcZzYbtkbPar.getTkjsbh()+"-"+KcZzYbtkbPar.getTkjsxm()+"<br/>";
 					}else{
 						QueryWrapper<KcKetangbiao> kcKetangbiaoQueryWrapper = new QueryWrapper<>();
-						kcKetangbiaoQueryWrapper.eq(StringUtils.isNotBlank(KcZzYbtkbPar.getKcbh()),"kcbh",KcZzYbtkbPar.getKcbh());
-						kcKetangbiaoQueryWrapper.eq(StringUtils.isNotBlank(KcZzYbtkbPar.getKcmc()),"kcmc",KcZzYbtkbPar.getKcmc());
-//						kcKetangbiaoQueryWrapper.eq(StringUtils.isNotBlank(KcZzYbtkbPar.getSkdd()),"skdd",KcZzYbtkbPar.getSkdd());
-						kcKetangbiaoQueryWrapper.like("skrq",DateUtil.format(KcZzYbtkbPar.getSkrq(),"yyyy-MM-dd"));
+						kcKetangbiaoQueryWrapper.eq("kcbh",KcZzYbtkbPar.getKcbh());
+						kcKetangbiaoQueryWrapper.eq("kcmc",KcZzYbtkbPar.getKcmc());
+						kcKetangbiaoQueryWrapper.eq("skdd",KcZzYbtkbPar.getSkdd());
+						kcKetangbiaoQueryWrapper.eq("skrq",DateUtil.format(KcZzYbtkbPar.getSkrq(),"yyyy-MM-dd"));
 						kcKetangbiaoQueryWrapper.eq("skjs",KcZzYbtkbPar.getSkjs());
 						List<KcKetangbiao> kcKetangBiaoList = kcKetangbiaoService.list(kcKetangbiaoQueryWrapper);
 						if(kcKetangBiaoList!=null && kcKetangBiaoList.size()>0){