From c7e8b28a453bf85fb78c1f09a6d613ecef9ea240 Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期一, 11 十二月 2023 08:27:12 +0800
Subject: [PATCH] 23

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
index 2af84db..c9b6c3f 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -320,6 +320,7 @@
                             customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
                             customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
                             customer.setConfirmStatus(String.valueOf(tjOrder.getStatus()));
+                            customer.setTjCategory(tjOrder.getTjCategory());
                             if (tjOrder.getFirmId().equals("0")) {
                                 customer.setTjCompName(null);
                             } else {
@@ -488,7 +489,14 @@
                     String summary = remark.getSummary();
                     if (null != summary) {
                           String[] split = summary.split(";");
-                        parent.put("parentAdvice", tjAdviceService.getAdviceStringByIds(Arrays.asList(split)));
+                        List<Long> longList = new ArrayList<>();
+                        for (String str : split) {
+                            if(!"".equals(str)){
+                                longList.add(Long.valueOf(str));
+                            }
+                        }
+                        //parent.put("parentAdvice", tjAdviceService.getAdviceStringByIds(longList));
+                        parent.put("parentAdvice", tjAdviceService.getAdviceStringByIds(split));
 
                     } else {
                         parent.put("parentAdvice", null);
@@ -557,6 +565,7 @@
                 customer.setTjTime(tjOrder.getCreateTime());
                 customer.setFinishTime(tjOrder.getFinishTime());
                 customer.setConfirmStatus(String.valueOf(tjOrder.getStatus()));
+                customer.setTjCategory(tjOrder.getTjCategory());
                 if (tjOrder.getFirmId() == null) {
                     customer.setTjCompName("鏃�");
                 } else {

--
Gitblit v1.8.0