From 1c79f9cb22aa8663192bef0fcaeeec5606aa467f Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 18 四月 2024 00:49:08 +0800
Subject: [PATCH] 集团属性池映射界面代码完善
---
Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupAttrPoolMappingServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupAttrPoolMappingServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupAttrPoolMappingServiceImpl.java
index c144df3..b14bbb1 100644
--- a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupAttrPoolMappingServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupAttrPoolMappingServiceImpl.java
@@ -194,7 +194,7 @@
List<GroupAttrPoolMapping> groupAttrPoolMappings = this.groupAttrPoolMappingMapper.selectList(
Wrappers.<GroupAttrPoolMapping>query().lambda().in(GroupAttrPoolMapping::getGroupAttrKey, groupKeyList)
);
- if(Func.isEmpty(groupAttrPoolMappings) && groupKeyList.size() == groupAttrPoolMappings.size()){
+ if(Func.isEmpty(groupAttrPoolMappings) || groupKeyList.size() != groupAttrPoolMappings.size()){
return R.fail("鍕鹃�夌殑瑕佸悓姝ョ殑闆嗗洟灞炴�т腑鏈夊湪搴撲腑涓嶅瓨鍦ㄧ殑鏁版嵁锛岃鍒锋柊鍚庨噸璇曪紒");
}
return dockingPreAttrMappingService.syncGroupAttrMapping(groupAttrPoolMappings);
@@ -206,7 +206,7 @@
* @return
*/
@Override
- public List<EnumVO> getEnumAttrByClsOIdAndAttrId(GroupAttrPoolMappingVO groupAttrPoolMappingVOS) {
+ public R getEnumAttrByClsOIdAndAttrId(GroupAttrPoolMappingVO groupAttrPoolMappingVOS) {
if(Func.isEmpty(groupAttrPoolMappingVOS.getClassifyId())){
throw new ServiceException("蹇呬紶鍙傛暟鍒嗙被oid涓嶈兘涓虹┖锛�");
}
@@ -217,16 +217,16 @@
List<CodeClassifyTemplateAttrVO> attrVOS = codeClassifyClient.listCodeAttributeByClassId(groupAttrPoolMappingVOS.getClassifyId());
// 绛涢�夊嚭妯℃澘灞炴�т腑id绛変簬codeMetaAttrKey鐨勶紝骞跺彇鍑篹numId
if(attrVOS.isEmpty()){
- return new ArrayList<>();
+ return R.fail("褰撳墠鍒嗙被鎵�浣跨敤妯℃澘鐨勬ā鏉垮睘鎬т腑鏈煡璇㈠埌鐩稿叧鐨勫睘鎬ч厤缃紝璇锋帓鏌ユā鏉块厤缃槸鍚︽纭��");
}
List<CodeClassifyTemplateAttrVO> codeClassifyTemplateAttrVOS = attrVOS.stream().filter(item -> item.getId().equalsIgnoreCase(groupAttrPoolMappingVOS.getCodeMetaAttrKey())).collect(Collectors.toList());
// 鏍规嵁涓婁竴姝ュ彇鍑虹殑enumId璋冪敤鏋氫妇鏈嶅姟鏌ヨ鍑烘灇涓惧苟杩斿洖
String enumId = codeClassifyTemplateAttrVOS.get(0).getEnumId();
if(Func.isBlank(enumId)){
- return new ArrayList<>();
+ return R.fail("鍦ㄧ郴缁熶腑鏍规嵁褰撳墠閰嶇疆鐨勬ā鏉垮睘鎬ф湭鏌ヨ鍒板叧浜庢灇涓剧殑閰嶇疆锛岃鎺掓煡鍏冩暟鎹笂鏄惁瀛樺湪鏋氫妇灞炴�э紒");
}
R<List<EnumVO>> list = enumClient.getList(enumId);
- return list.getData();
+ return R.data(list.getData());
}
}
--
Gitblit v1.9.3