From e472047e283da4ae8c62016b746ad2b072fd56f5 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期二, 05 九月 2023 08:49:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
index c70eed4..286e404 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
@@ -524,7 +524,7 @@
);
// 涓虹┖锛岃瘉鏄庝笉瀛樺湪绫诲悓鐨勭紪鐮佽鍒欑洿鎺ヨ繑鍥�
if(Func.isEmpty(codeRuleList)){
- return R.data(new ResultDataVO());
+ return R.data(new ResultDataVO(true));
}
// 鏌ヨ鍑哄熀纭�鐮佹鍒楄〃锛堟寜鐓rderNum鍗囧簭鎺掑簭锛�
List<CodeRuleVO> codeRuleVOS = codeRuleDO2VOs(codeRuleList, true);
@@ -614,7 +614,7 @@
});
// 涓虹┖鏃惰鏄庢楠�3娌℃瘮瀵瑰嚭绫讳技鐨勭紪鐮佽鍒�
if(lastCodeRule.isEmpty()){
- return R.data(new ResultDataVO());
+ return R.data(new ResultDataVO(true));
}
StringBuffer resMsg = new StringBuffer();
resMsg.append("瀛樺湪濡備笅鐩镐技瑙勫垯锛屾槸鍚︾户缁彂甯冿紵\n");
--
Gitblit v1.9.3