From c42f62b32bac302a7ac9fcde7489f7c5fc6e11aa Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 06 十二月 2024 15:35:17 +0800
Subject: [PATCH] zjh20241205-3
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHzLogController.java | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHzLogController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHzLogController.java
index c79e51e..49f2a2a 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHzLogController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHzLogController.java
@@ -128,13 +128,12 @@
@Log(title = "浼氳瘖鐢宠璁板綍", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody TjHzLog tjHzLog) {
- if (tjHzLog.getHzDeptIdList() == null && "1".equals(tjHzLog.getHzType())) {
+ if (tjHzLog.getHzDeptIdList() == null && "1".equals(tjHzLog.getHzType()) && tjHzLog.getHzDeptIdList().size() == 0) {
return AjaxResult.error("璇烽�夋嫨绉戝");
}
- if (tjHzLog.getHzDeptIdList() != null) {
+ if (tjHzLog.getHzDeptIdList() != null && tjHzLog.getHzDeptIdList().size() > 0) {
StringBuilder str = new StringBuilder();
for (int i = 0; i < tjHzLog.getHzDeptIdList().size(); i++) {
-
str = str.append(tjHzLog.getHzDeptIdList().get(i));
if (i != tjHzLog.getHzDeptIdList().size() - 1) {
str = str.append(",");
@@ -142,7 +141,6 @@
}
tjHzLog.setHzDeptId(String.valueOf(str));
}
- //淇敼褰撳墠浼氳瘖鐘舵��
if (tjHzLog.getOrderId() == null) {
return AjaxResult.error("鍑洪敊浜嗭紝璇疯仈绯诲伐浣滀汉鍛�");
}
@@ -161,16 +159,19 @@
@Log(title = "浼氳瘖鐢宠璁板綍 ", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody TjHzLog tjHzLog) {
- if (tjHzLog.getHzDeptIdList() != null) {
- StringBuilder str = new StringBuilder();
- for (int i = 0; i < tjHzLog.getHzDeptIdList().size(); i++) {
-
- str = str.append(tjHzLog.getHzDeptIdList().get(i));
- if (i != tjHzLog.getHzDeptIdList().size() - 1) {
- str = str.append(",");
+ if ("1".equals(tjHzLog.getHzType())) {
+ if (tjHzLog.getHzDeptIdList() != null && tjHzLog.getHzDeptIdList().size() > 0) {
+ StringBuilder str = new StringBuilder();
+ for (int i = 0; i < tjHzLog.getHzDeptIdList().size(); i++) {
+ str = str.append(tjHzLog.getHzDeptIdList().get(i));
+ if (i != tjHzLog.getHzDeptIdList().size() - 1) {
+ str = str.append(",");
+ }
}
+ tjHzLog.setHzDeptId(String.valueOf(str));
+ }else {
+ return AjaxResult.error("璇烽�夋嫨绉戝");
}
- tjHzLog.setHzDeptId(String.valueOf(str));
}
return toAjax(tjHzLogService.saveOrUpdate(tjHzLog));
}
@@ -195,7 +196,7 @@
wq1.eq(TjOrder::getTjNumber, tjNumber);
wq1.eq(TjOrder::getIsHz, 1);
final List<TjOrder> list = tjOrderService.list(wq1);
- if (list == null || list.size() == 0) {
+ if (list == null || list.isEmpty()) {
return AjaxResult.success(0);
}
for (TjOrder tjOrder : list) {
--
Gitblit v1.8.0