From 0892d843cd394f383ff50f480f7f22f2ec3829bc Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 27 六月 2025 20:24:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java | 5 ++---
1 files changed, 2 insertions(+), 3 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 351c120..af53c70 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
@@ -433,14 +433,13 @@
jcbgdService.save(jcbgd);
jcsqdService.saveXdtLtkjExamJcsqd(xdtgmdjg.getCardId(),jcbgd.getTmh());
- jcsqdService.deletedLtkjJcsqdByTjhandtmh1(xdtgmdjg.getCardId());
-
LambdaQueryWrapper<TjJcycxm> wq=new LambdaQueryWrapper<>();
wq.eq(TjJcycxm::getTjh,xdtgmdjg.getTjh());
wq.eq(TjJcycxm::getProId,xdtgmdjg.getProId());
jcycxmService.remove(wq);
if(StringUtil.isNotBlank(xdtgmdjg.getJcjl())){
- String[] split = xdtgmdjg.getJcjl().replaceAll("\n", "").split("銆倈锛泑;|,|锛�");
+ String s = "銆倈锛泑;|,|锛�";
+ String[] split = xdtgmdjg.getJcjl().replaceAll("\n", "銆�").split(s);
for (String jg : split) {
if(StringUtil.isNotBlank(jg) && !jg.contains("鏈寮傚父")
&& !jg.contains("鏈鏄庢樉寮傚父") && !jg.contains("鏈鍗犱綅") && !jg.contains("鏈")
--
Gitblit v1.8.0