From 99d28bddd6ad5bd7c87babf7dcab670215993cb6 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 03 七月 2025 13:51:36 +0800
Subject: [PATCH] zjh20250703

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java |   40 +++++++++++++++++++++-------------------
 1 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
index e7a3bd5..87a916b 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
@@ -440,25 +440,27 @@
 
     public void zongjianshengchengyichangxiangmu(String s, String yqbm) {
         TjOrder order = orderService.getOrderByTjNum(s);
-        jcycxmService.deletedByTjh(s);
-        List<LtkjExamJcsqd> list = jcsqdService.getLtkjJcsqdByTjh(order.getCardId());
-        if(null !=list && !list.isEmpty()){
-            for (LtkjExamJcsqd jcsqd : list) {
-                if(StringUtil.isNotBlank(jcsqd.getJgzt())){
-                    String[] split = jcsqd.getJgzt().replaceAll("\n", "").split("銆倈锛泑;|,|锛�");
-                    for (String jg : split) {
-                        if(StringUtil.isNotBlank(jg) && !jg.contains("鏈寮傚父")
-                                && !jg.contains("鏈鏄庢樉寮傚父") && !jg.contains("鏈鍗犱綅")  && !jg.contains("鏃犲紓甯�")
-                                && !jg.contains("鏈鏄庢樉")&& !jg.contains("姝e父")&& !jg.contains("鍙屼晶妞庨棿瀛旀棤鐙獎")&& !jg.contains("鏃犳畩")){
-                            TjJcycxm jcycxm=new TjJcycxm();
-                            jcycxm.setTjh(s);
-                            jcycxm.setYqid(yqbm);
-                            String[] split1 = jcsqd.getJcxmid().split(";");
-                            jcycxm.setProId(split1[0]);
-                            jcycxm.setProName(jcsqd.getJcxmmc());
-                            jcycxm.setCreateTime(new Date());
-                            jcycxm.setJcjg(jg);
-                            jcycxmService.save(jcycxm);
+        if(null != order){
+            jcycxmService.deletedByTjh(s);
+            List<LtkjExamJcsqd> list = jcsqdService.getLtkjJcsqdByTjh(order.getCardId());
+            if(null !=list && !list.isEmpty()){
+                for (LtkjExamJcsqd jcsqd : list) {
+                    if(StringUtil.isNotBlank(jcsqd.getJgzt())){
+                        String[] split = jcsqd.getJgzt().replaceAll("\n", "").split("銆倈锛泑;|,|锛�");
+                        for (String jg : split) {
+                            if(StringUtil.isNotBlank(jg) && !jg.contains("鏈寮傚父")
+                                    && !jg.contains("鏈鏄庢樉寮傚父") && !jg.contains("鏈鍗犱綅")  && !jg.contains("鏃犲紓甯�")
+                                    && !jg.contains("鏈鏄庢樉")&& !jg.contains("姝e父")&& !jg.contains("鍙屼晶妞庨棿瀛旀棤鐙獎")&& !jg.contains("鏃犳畩")){
+                                TjJcycxm jcycxm=new TjJcycxm();
+                                jcycxm.setTjh(s);
+                                jcycxm.setYqid(yqbm);
+                                String[] split1 = jcsqd.getJcxmid().split(";");
+                                jcycxm.setProId(split1[0]);
+                                jcycxm.setProName(jcsqd.getJcxmmc());
+                                jcycxm.setCreateTime(new Date());
+                                jcycxm.setJcjg(jg);
+                                jcycxmService.save(jcycxm);
+                            }
                         }
                     }
                 }

--
Gitblit v1.8.0