From da7dd957342aa96b31f17e3d61792896e006d6e2 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 28 七月 2025 17:38:32 +0800
Subject: [PATCH] zjh20250728-1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java
index 192f08b..b8545f3 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java
@@ -254,7 +254,7 @@
for (CsProVo vo : list) {
LambdaQueryWrapper<TjXdtgmdjg> wq=new LambdaQueryWrapper<>();
wq.eq(TjXdtgmdjg::getTjh,tjNumber);
- wq.eq(TjXdtgmdjg::getProId,vo.getProId());
+ wq.eq(TjXdtgmdjg::getProId,vo.getProId().toString());
TjXdtgmdjg xdtgmdjg = xdtgmdjgService.getOne(wq);
if(null !=xdtgmdjg){
if(StringUtil.isNotBlank(xdtgmdjg.getUrl())){
@@ -367,18 +367,23 @@
wq.eq(TjJcycxm::getProId,xdtgmdjg.getProId());
jcycxmService.remove(wq);
if(StringUtil.isNotBlank(xdtgmdjg.getJcjl())){
- String[] split = xdtgmdjg.getJcjl().replaceAll("\n", "").split("銆倈锛泑;|,|锛�");
+ String regex = configService.selectConfigByKey("jcycxmzz");
+ if(StringUtil.isBlank(regex)) regex= "銆倈锛泑;|,|锛�";
+ String[] split = xdtgmdjg.getJcjl().replaceAll("\n", "").split(regex);
+// String[] split = xdtgmdjg.getJcjl().replaceAll("\n", "").split("銆倈锛泑;|,|锛�");
for (String jg : split) {
- boolean b = configController.apiJcycpdgjz(jg);
- if(!b){
- TjJcycxm jcycxm=new TjJcycxm();
- jcycxm.setTjh(xdtgmdjg.getTjh());
- jcycxm.setYqid("");
- jcycxm.setProId(xdtgmdjg.getProId());
- jcycxm.setProName(xdtgmdjg.getProName());
- jcycxm.setCreateTime(new Date());
- jcycxm.setJcjg(jg);
- jcycxmService.save(jcycxm);
+ if(StringUtil.isNotBlank(jg)){
+ boolean b = configController.apiJcycpdgjz(jg);
+ if(!b){
+ TjJcycxm jcycxm=new TjJcycxm();
+ jcycxm.setTjh(xdtgmdjg.getTjh());
+ jcycxm.setYqid("");
+ jcycxm.setProId(xdtgmdjg.getProId());
+ jcycxm.setProName(xdtgmdjg.getProName());
+ jcycxm.setCreateTime(new Date());
+ jcycxm.setJcjg(jg);
+ jcycxmService.save(jcycxm);
+ }
}
/* if(StringUtil.isNotBlank(jg) && !jg.contains("鏈寮傚父")
&& !jg.contains("鏈鏄庢樉寮傚父") && !jg.contains("鏈鍗犱綅") && !jg.contains("鏈")
--
Gitblit v1.8.0