From aa6be631961866afbee6b866b1fbb84a50da3910 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期三, 02 八月 2023 12:20:01 +0800
Subject: [PATCH] 1、通用查询数据类型报错问题。 2、通用更新列重复问题。

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.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/CodeClstemplateServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java
index e849ba0..6ff578d 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java
@@ -898,11 +898,11 @@
 
 		//鎵�鏈夊垎绫婚兘娌℃湁涓氬姟绫诲瀷锛岃繑鍥炴彁绀�
 		if(codeClassifyDOList.size()==0){
-			return R.fail("娣诲姞妯℃澘娣诲姞澶辫触,鍒嗙被鍜屼笂绾у垎绫婚兘娌℃湁鍏宠仈涓氬姟绫诲瀷锛�");
+			return R.fail(DATA_OID_NOT_EXIST);
 		}
 
 		//璁剧疆btmtypeid鍜宯ame
-		CodeClassify codeClassifyDO = codeClassifyDOList.get(0);
+		CodeClassify codeClassifyDO = codeClassifyDOList.stream().filter(s -> StringUtils.isNotBlank(s.getBtmTypeId())).findFirst().get();
 		codeClassifyTemplateDO.setBtmTypeId(codeClassifyDO.getBtmTypeId());
 		codeClassifyTemplateDO.setNameOid(VciBaseUtil.getPk());
 		codeClassifyTemplateDO.setBtmTypeName(codeClassifyDO.getBtmTypeName());

--
Gitblit v1.9.3