From 8e832c69b20bd34f6da9ef25324ec690d1cccbe3 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 30 一月 2024 11:30:32 +0800
Subject: [PATCH] 业务类型对象,分类授权,字符集相关代码修改

---
 Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/IMenuService.java                 |    2 +-
 Source/UBCS-WEB/src/views/ruleBasic/delimiterConfig.vue                                                          |    3 +--
 Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/mapper/MenuMapper.java                    |    2 +-
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java            |    4 ++++
 Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/MenuMapper.xml                                    |    7 +++++--
 Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/ClassifyAuthServiceImpl.java |    2 +-
 Source/UBCS-WEB/src/views/ruleBasic/paddingCharacter.vue                                                         |    3 +--
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java        |    2 +-
 Source/UBCS-WEB/src/views/ruleBasic/usableCharacter.vue                                                          |    3 +--
 Source/UBCS-WEB/src/views/ruleBasic/prefixConfig.vue                                                             |    1 -
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java   |    6 +-----
 Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSCondition.java            |    2 ++
 Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java         |    4 ++--
 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java            |   11 ++++++++++-
 14 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/ruleBasic/delimiterConfig.vue b/Source/UBCS-WEB/src/views/ruleBasic/delimiterConfig.vue
index 0e5fb46..6df510b 100644
--- a/Source/UBCS-WEB/src/views/ruleBasic/delimiterConfig.vue
+++ b/Source/UBCS-WEB/src/views/ruleBasic/delimiterConfig.vue
@@ -1,6 +1,5 @@
 <template>
   <basic-container>
-
     <el-header>
       <div style="margin-bottom: 15px">
         缂栫爜瑙勫垯锛�
@@ -8,7 +7,7 @@
                    @change="selectHandler">
           <el-option v-for="(item,index) in queryReleasedList"
                      :key="item.oid"
-                     :label="item.name"
+                     :label="item.name + ' (' + item.id + ')'"
                      :value="item.oid"></el-option>
         </el-select>
       </div>
diff --git a/Source/UBCS-WEB/src/views/ruleBasic/paddingCharacter.vue b/Source/UBCS-WEB/src/views/ruleBasic/paddingCharacter.vue
index 74897c3..b50fec3 100644
--- a/Source/UBCS-WEB/src/views/ruleBasic/paddingCharacter.vue
+++ b/Source/UBCS-WEB/src/views/ruleBasic/paddingCharacter.vue
@@ -1,6 +1,5 @@
 <template>
   <basic-container>
-
     <el-header>
       <div style="margin-bottom: 15px">
         缂栫爜瑙勫垯锛�
@@ -8,7 +7,7 @@
                    @change="selectHandler">
           <el-option v-for="(item,index) in queryReleasedList"
                      :key="item.oid"
-                     :label="item.name"
+                     :label="item.name + ' (' + item.id + ')'"
                      :value="item.oid"></el-option>
         </el-select>
       </div>
diff --git a/Source/UBCS-WEB/src/views/ruleBasic/prefixConfig.vue b/Source/UBCS-WEB/src/views/ruleBasic/prefixConfig.vue
index 9d83440..329295d 100644
--- a/Source/UBCS-WEB/src/views/ruleBasic/prefixConfig.vue
+++ b/Source/UBCS-WEB/src/views/ruleBasic/prefixConfig.vue
@@ -1,6 +1,5 @@
 <template>
   <basic-container>
-
     <el-header>
       <div style="margin-bottom: 15px">
         缂栫爜瑙勫垯锛�
diff --git a/Source/UBCS-WEB/src/views/ruleBasic/usableCharacter.vue b/Source/UBCS-WEB/src/views/ruleBasic/usableCharacter.vue
index 5be2861..d91ed31 100644
--- a/Source/UBCS-WEB/src/views/ruleBasic/usableCharacter.vue
+++ b/Source/UBCS-WEB/src/views/ruleBasic/usableCharacter.vue
@@ -1,6 +1,5 @@
 <template>
   <basic-container>
-
     <el-header>
       <div style="margin-bottom: 15px">
         缂栫爜瑙勫垯锛�
@@ -8,7 +7,7 @@
                    @change="selectHandler">
           <el-option v-for="(item,index) in queryReleasedList"
                      :key="item.oid"
-                     :label="item.name"
+                     :label="item.name + ' (' + item.id + ')'"
                      :value="item.oid"></el-option>
         </el-select>
       </div>
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSCondition.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSCondition.java
index c015273..be21eb0 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSCondition.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSCondition.java
@@ -212,6 +212,8 @@
 				} else if(key.endsWith("_notin")) {
 					String field = UBCSSqlKeyword.getColumn(key, "_notin");
 					sql = VciBaseUtil.toInSql(field,value);
+				}else{
+					sql = VciBaseUtil.toInSql(key,value);
 				}
 				if(!sql.isEmpty()){
 					whereSqlList.add(sql);
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
index 12c409e..22e1a3d 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
@@ -2007,7 +2007,7 @@
 		} catch (Exception e) {
 			String errorMessage = e.getMessage();
 			if (errorMessage.contains("鏃犳硶瑙f瀽鐨勬垚鍛樿闂〃杈惧紡")) {
-				throw new ServiceException("缂哄皯" + errorMessage.substring(errorMessage.indexOf("[t.") + 1, errorMessage.indexOf("]")) + "瀛楁");
+				throw new ServiceException("缂哄皯" + errorMessage.substring(errorMessage.indexOf("[T.") + 1, errorMessage.indexOf("]")) + "瀛楁");
 			}
 			throw new ServiceException(e.getMessage());
 		}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
index 525198e..0e551e1 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
@@ -971,6 +971,7 @@
 			Map<String,String>resembleMap=new HashMap<>();
 			List<DataResembleVO> dataResembleVOS=new ArrayList<>();
 			String btmtypeid= classifyFullInfo.getTopClassifyVO().getBtmTypeId();
+			//鐩镐技椤规煡璇㈣鍒�
 			bathcResembleQuery(codeClassifyOid,templateVO,needSaveCboList,resembleMap,btmtypeid,dataResembleVOS);
 			if(resembleMap.size()>0) {
 				if(!CollectionUtils.isEmpty(dataResembleVOS)) {
@@ -1280,6 +1281,7 @@
 				Map<String, String> resembleMap = new HashMap<>();
 				List<DataResembleVO> dataResembleVOS = new ArrayList<>();
 				String btmtypeid = classifyFullInfo.getTopClassifyVO().getBtmTypeId();
+				// 鐩镐技椤规煡璇�
 				bathcResembleQuery(templateVO.getCodeclassifyoid(), templateVO, needSaveCboList, resembleMap, btmtypeid, dataResembleVOS);
 				if (resembleMap.size() > 0) {
 					if (!CollectionUtils.isEmpty(dataResembleVOS)) {
@@ -1287,6 +1289,7 @@
 						createRedisDatas(uuid + "-resemble", templateVO, rowIndexCboMap, dataSet, fieldIndexMap, resembleMap, false);
 					}
 				}
+
 				//鐢熸垚class缂撳瓨
 				Map<String, String> rowIndexClsOidMap = cboList.stream().filter(cbo -> cbo != null).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getAttributeValue((IMPORT_ROW_INDEX)), t -> t.getAttributeValue(CODE_CLASSIFY_OID_FIELD)));
 				createRedisByCodeClassify(uuid + "-class",templateVO,dataSet,fieldIndexMap,true);
@@ -1759,6 +1762,7 @@
 			Map<String,String>resembleMap=new HashMap<>();
 			List<DataResembleVO> dataResembleVOS=new ArrayList<>();
 			String btmtypeid= classifyFullInfo.getTopClassifyVO().getBtmTypeId();
+			//鐩镐技椤规煡璇�
 			bathcResembleQuery(orderDTO.getCodeClassifyOid(),templateVO,needSaveCboList,resembleMap,btmtypeid,dataResembleVOS);
 			if(resembleMap.size()>0) {
 				isCreateUUid=true;
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java
index 30c8413..79a0fea 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java
@@ -503,8 +503,6 @@
 		}
 	}
 
-
-
 	/**
 	 * 杞崲娴佹按鐮佹鐨勫��
 	 * @param serialSecVOList 娴佹按鐮佹
@@ -616,9 +614,7 @@
 			}
 		}
 	}
-
-
-
+	
 	/**
 	 * 杞崲娴佹按鐮佹鐨勫��
 	 * @param serialSecVOList 娴佹按鐮佹
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java
index 1d2927e..bb016e6 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java
@@ -7,10 +7,12 @@
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.vci.ubcs.omd.cache.EnumCache;
 import com.vci.ubcs.omd.constant.BtmTypeConstant;
 import com.vci.ubcs.omd.constant.BtmTypeFieldConstant;
 import com.vci.ubcs.omd.dto.BtmAndLinkTypeDdlDTO;
 import com.vci.ubcs.omd.entity.*;
+import com.vci.ubcs.omd.enums.EnumEnum;
 import com.vci.ubcs.omd.repeater.DomainRepeater;
 import com.vci.ubcs.omd.service.*;
 import com.vci.ubcs.omd.vo.*;
@@ -1053,7 +1055,14 @@
 			});
 		}
 
-		return list;
+		// 璁剧疆瀛楁绫诲瀷涓枃鏄剧ず鍊�,鍜屾帓搴�
+		List<BtmTypeAttributeVO> sortedList = list.stream()
+			.sorted(Comparator.comparing(BtmTypeAttributeVO::getIsDefaultAttr))
+			.map(item-> {
+				item.setAttrDataTypeText(EnumCache.getValue(EnumEnum.VCI_FIELD_TYPE, item.getAttrDataType()));
+				return item;
+			}).collect(Collectors.toList());
+		return sortedList;
 	}
 
 }
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/mapper/MenuMapper.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/mapper/MenuMapper.java
index 1c19e5c..4767e8f 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/mapper/MenuMapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/mapper/MenuMapper.java
@@ -146,7 +146,7 @@
 	 *
 	 * @return
 	 */
-	List<Menu> getButtonByIdsOrByParentCode(@Param("roleIds") String roleIds, @Param("code") String code,@Param("ids") List<String> ids);
+	List<Menu> getButtonByIdsOrByParentCode(@Param("roleIds") List<String> roleIds, @Param("code") String code,@Param("ids") List<String> ids);
 
 	/**
 	 * 鏉冮檺閰嶇疆鑿滃崟
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/IMenuService.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/IMenuService.java
index 0708dd5..3b1587f 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/IMenuService.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/IMenuService.java
@@ -220,7 +220,7 @@
 	 * @param roleIds
 	 * @return
 	 */
-	List<Menu> getMenuListByCode(List<String> ids,String menuCode,String roleIds);
+	List<Menu> getMenuListByCode(List<String> ids,String menuCode,List<String> roleIds);
 
 	/**
 	 * 鏍规嵁瑙掕壊id鑾峰彇宸叉巿鏉冪殑鎸夐挳淇℃伅
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/ClassifyAuthServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/ClassifyAuthServiceImpl.java
index 7bdaf05..89b8362 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/ClassifyAuthServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/ClassifyAuthServiceImpl.java
@@ -151,7 +151,7 @@
 		}
 		// 杩斿洖鐨勫垎绫籵id鏄綋鍓嶈妭鐐逛负绗竴涓紝鍚庨潰渚濇鏄粬鐨勪笂灞傝妭鐐�
 		List<String> classifyOidList = listR.getData();
-		final String roleIds = AuthUtil.getUser().getRoleId();
+		final List<String> roleIds = Func.toStrList(",",AuthUtil.getUser().getRoleId());
 		// 鍏堟煡璇㈡寜閽甶d鍒楄〃
 		LambdaQueryWrapper<ClassifyAuth> wrapper = Wrappers.<ClassifyAuth>query()
 			.lambda().eq(ClassifyAuth::getClassifyId, classifyId)
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java
index c577eee..475daee 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java
@@ -345,7 +345,7 @@
 		}
 		// 杩斿洖鐨勫垎绫籵id鏄綋鍓嶈妭鐐逛负绗竴涓紝鍚庨潰渚濇鏄粬鐨勪笂灞傝妭鐐�
 		List<String> classifyOidList = listR.getData();
-		final String roleIds = AuthUtil.getUser().getRoleId();
+		final List<String> roleIds = Func.toStrList(",",AuthUtil.getUser().getRoleId());
 		// 鍏堟煡璇㈡寜閽甶d鍒楄〃
 		LambdaQueryWrapper<ClassifyAuth> wrapper = Wrappers.<ClassifyAuth>query()
 			.lambda().eq(ClassifyAuth::getClassifyId, classifyId)
@@ -494,7 +494,7 @@
 	 * @return
 	 */
 	@Override
-	public List<Menu> getMenuListByCode(List<String> ids,String menuCode,String roleIds){
+	public List<Menu> getMenuListByCode(List<String> ids,String menuCode,List<String> roleIds){
 		List<Menu> menuButtonList = null;
 		if(VciBaseUtil.checkAdminTenant()){
 			// 姝e父鎯呭喌涓嬫潵璇磋繖涓笉瀛樺湪涓虹┖鐨勬儏鍐�
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/MenuMapper.xml b/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/MenuMapper.xml
index 68dd8a2..0ec2a53 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/MenuMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/MenuMapper.xml
@@ -531,7 +531,7 @@
 
     <select id="getButtonByIdsOrByParentCode" resultMap="menuResultMap">
         SELECT
-            pm.*
+            DISTINCT pm.*
         FROM
             PL_SYS_MENU pm
             <if test="code != null and code != ''">
@@ -550,7 +550,10 @@
             </if>
             <if test="roleIds != null and roleIds != ''">
                 AND pm.ID = prom.MENU_ID
-                AND prom.ROLE_ID in (#{roleIds})
+                AND prom.ROLE_ID IN
+                <foreach collection="roleIds" index="index" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
             </if>
             <if test="ids != null and ids != ''">
                 AND pm.ID IN

--
Gitblit v1.9.3