From b162a7ef4136a9d38140ff98bfeda798925ac839 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 18 十月 2024 18:24:37 +0800
Subject: [PATCH] zjh20241018
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java
index dfd263b..82967ba 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java
@@ -260,7 +260,6 @@
wrapper.eq(TjSampling::getCusId, cusId);
wrapper.eq(TjSampling::getIsSignFor,isSignFor);
wrapper.and(i -> i.isNull(TjSampling::getParentId).or().eq(TjSampling::getIsMerge,1));
-// wrapper.isNull(TjSampling::getParentId).or().eq(TjSampling::getIsMerge,1);
wrapper.orderByDesc(TjSampling::getIsMerge);
List<TjSampling> list = tjSamplingService.list(wrapper);
if (list.isEmpty()){
@@ -268,8 +267,8 @@
return AjaxResult.error("鍙傛暟閿欒,鏈煡璇㈠埌鏁版嵁");
}
for (TjSampling sampling : list) {
-// sampling.setCusName(MatchUtils.hideCusName(sampling.getCusName()));
- sampling.setCusName(sampling.getCusName());
+ TjCustomer customer = customerService.getById(sampling.getCusId());
+ sampling.setCustomer(customer);
}
return AjaxResult.success(list);
}
@@ -287,6 +286,7 @@
int pdsfczhbxm = tjSamplingService.pdsfczhbxm(ids);
if (pdsfczhbxm == ids.size()) return AjaxResult.error("澶氫釜鍚堝苟椤圭洰涓嶅彲鍐嶇户缁悎骞�!");
if (pdsfczhbxm > 1) return AjaxResult.error("鏈�澶氬厑璁搁�夋嫨涓�涓悎骞惰繃鐨勯」鐩�!");
+// 鏌ヨ鍑洪噷闈笉鍙悎骞剁殑鍖栭獙椤圭洰
String string = tjSamplingService.getBuKeHebingProName(ids);
if(null !=string){
return AjaxResult.error(string+"杩欏嚑涓」鐩笉鍙悎骞�!");
--
Gitblit v1.8.0