From 4f873f73c5b7a5af020cd71a0062c438771f98e7 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 20 三月 2025 18:02:06 +0800
Subject: [PATCH] zjh20250320
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java | 4 ++--
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java | 19 +++++++++++--------
2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
index 03f6c27..86c55e7 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
@@ -389,8 +389,8 @@
// tjFlowingWater.setPayStasus(1L);
TjOrder order = orderService.getById(tjFlowingWater.getOrderId());
- if (order.getFinishTime() != null) {
- return AjaxResult.error("璇ヤ汉鍛樺凡绛剧,涓嶅彲琛ュ綍椤圭洰!");
+ if (order.getPrintLastTime() != null) {
+ return AjaxResult.error("璇ヤ汉鍛樻姤鍛婂凡鎵撳嵃,涓嶅彲琛ュ綍椤圭洰!");
}
TjCustomer customer = customerService.getById(order.getUserId());
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 a790422..78d6b3e 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
@@ -81,14 +81,17 @@
for (Map.Entry<String, List<TjXdPicture>> entry : stringListMap.entrySet()) {
Map<String,Object>map=new HashMap<>();
TjCustomer customer = customerService.getById(entry.getKey());
- customer.setCusName(MatchUtils.hideCusName(customer.getCusName()));
- customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
- customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
- customer.setTjNumber(entry.getValue().get(0).getTjNum());
- map.put("list",entry.getValue());
- map.put("customer",customer);
- map.put("picturePath",configService.selectConfigByKey("TjXdPicture"));
- arrayList.add(map);
+ if(null !=customer){
+ customer.setCusName(MatchUtils.hideCusName(customer.getCusName()));
+ customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
+ customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
+ customer.setTjNumber(entry.getValue().get(0).getTjNum());
+ map.put("list",entry.getValue());
+ map.put("customer",customer);
+ map.put("picturePath",configService.selectConfigByKey("TjXdPicture"));
+ arrayList.add(map);
+ }
+
}
}
List<Map<String, Object>> collect =null;
--
Gitblit v1.8.0