From 34f6939fdac950c99253b063f80adcb25bc2b1a1 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 05 十二月 2024 23:04:00 +0800
Subject: [PATCH] zjh20241205-2
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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 c4e4d68..a8615bd 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
@@ -63,7 +63,7 @@
*/
@RestController
@RequestMapping ("/check")
-@Api (tags = "鎬绘鍖诲笀鐩稿叧鎺ュ彛")
+@Api (tags = "AAAAAAAAAAAA鎬绘鍖诲笀鐩稿叧鎺ュ彛")
@Slf4j
public class TjCheckController {
@Resource
@@ -631,7 +631,7 @@
}
return AjaxResult.success("鍚屾鎴愬姛");
}
- else if(null !=sfkqdshitulianjie && sfkqdshitulianjie.equals("Y")){
+ else if(null !=sfkqdshitulianjie && sfkqdshitulianjie.equalsIgnoreCase("Y")){
List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(order.getTjNumber());
if(null != hysqdList && !hysqdList.isEmpty()){
for (LtkjHysqd hysqd : hysqdList) {
@@ -1197,8 +1197,12 @@
@ApiParam (value = "鎬绘寤鸿") @RequestParam (required = false) String advice,
@ApiParam (value = "瀹℃牳鐘舵��0寰呭鏍�1宸插鏍�") @RequestParam Integer checkStatus) {
- int num = orderRemarkService.getTjYqOrderRemarkByTjNum(tjNumber);
- if (num > 0) return AjaxResult.error("鏈夊欢鏈熼」鐩殏涓嶈兘鐢熸垚鎶ュ憡!!!");
+ String config = configService.selectConfigByKey("sfjcwjhyqxm");
+ if(null != config && config.equalsIgnoreCase("Y")){
+ int num = orderRemarkService.getTjYqOrderRemarkByTjNum(tjNumber);
+ if (num > 0) return AjaxResult.error("瀛樺湪鏈鎴栧欢鏈熼」鐩殏涓嶈兘鐢熸垚鎶ュ憡!!!");
+ }
+
if (null != tjNumber) {
Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
SysUser sysUser = userService.getById(userId);
--
Gitblit v1.8.0