From 2025087a8dec8f2d301459b9d41c9ef00f6f9289 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 19 七月 2023 17:51:41 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java |  322 +++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 259 insertions(+), 63 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
index c47f444..d62a822 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
@@ -40,12 +40,19 @@
 import com.vci.ubcs.starter.revision.model.TreeQueryObject;
 import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
 import com.vci.ubcs.starter.util.UBCSSqlKeyword;
+import com.vci.ubcs.starter.web.constant.QueryOptionConstant;
 import com.vci.ubcs.starter.web.pagemodel.SessionInfo;
 import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
 import com.vci.ubcs.starter.web.util.VciBaseUtil;
+import com.vci.ubcs.system.feign.ISysClient;
+import com.vci.ubcs.system.user.entity.User;
+import com.vci.ubcs.system.user.feign.IUserClient;
+import com.vci.ubcs.system.vo.DeptVO;
+import com.vci.ubcs.system.vo.RoleVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import javax.annotation.Resource;
@@ -64,7 +71,8 @@
 @Slf4j
 @VciWebservice(path = "/universalInterface")
 public class UniversalInterfaceImpl<IDockingLogeServiceing> implements UniversalInterfaceI {
-
+	@Value("${code.universalinterface.checkSystemConfig:true}")
+	public boolean CODE_CHECKCONFIG;
 	@Autowired(required = false)
 	private AttributeMapConfig attributeMapConfig;
 	/**
@@ -83,6 +91,18 @@
 	 */
 	@Autowired
 	private IBtmTypeClient btmTypeClient;
+
+	/**
+	 * 浜哄憳鏈嶅姟
+	 */
+	@Autowired
+	private  ISysClient sysClient;
+
+	/**
+	 * 浜哄憳鏈嶅姟
+	 */
+	@Autowired
+	private IUserClient userClient;
 
 	/**
 	 * 閫氱敤鏌ヨ
@@ -334,14 +354,12 @@
 			ClassfysVO classfysVO = interParameterVO.getData().getClassifys();
 			systemId = interParameterVO.getData().getSystemId();
 
-
 			//鏍¢獙鏄惁閰嶇疆
-			boolean checkPass= checkIspass(systemId, SysIntegrationDataFlowTypeEnum.ACCEPT.getValue(), sysIntegrationPushTypeEnum.ACCPET_EDITCODE.getValue());
-			if(!checkPass){
-				errorid="101";
-				throw new Throwable("绯荤粺鏍囪瘑涓恒��"+systemId+"銆�,"+sysIntegrationPushTypeEnum.ACCPET_EDITCODE.getText()+"鎺ュ彛閰嶇疆宸插仠鐢ㄦ垨鑰呮湭閰嶇疆锛岃鑱旂郴缂栫爜绠$悊鍛橈紒");
+			boolean checkPass = checkIspass(systemId, SysIntegrationDataFlowTypeEnum.ACCEPT.getValue(), sysIntegrationPushTypeEnum.ACCPET_EDITCODE.getValue());
+			if (!checkPass) {
+				errorid = "101";
+				throw new Throwable("绯荤粺鏍囪瘑涓恒��" + systemId + "銆�," + sysIntegrationPushTypeEnum.ACCPET_EDITCODE.getText() + "鎺ュ彛閰嶇疆宸插仠鐢ㄦ垨鑰呮湭閰嶇疆锛岃鑱旂郴缂栫爜绠$悊鍛橈紒");
 			}
-
 			UserVO userVo = interParameterVO.getData().getUser();
 			List<ClassfyVO> classVOList = classfysVO.getClassify();
 			InterParameterVO finalInterParameterVO = interParameterVO;
@@ -493,12 +511,11 @@
 			String libId= libraryVO.getId();
 			List<String> classifyIdList=  libraryVO.getClassifyid();
 			List<CodeClassifyVO> codeClassifyVOS =new ArrayList<>();
-
-			//鏍¢獙鏄惁閰嶇疆
-			boolean checkPass= checkIspass(systemId, SysIntegrationDataFlowTypeEnum.ACCEPT.getValue(), sysIntegrationPushTypeEnum.ACCPET_QUERYCLAFILY.getValue());
-			if(!checkPass){
-				errorid="101";
-				throw new Throwable("绯荤粺鏍囪瘑涓恒��"+systemId+"銆�,"+sysIntegrationPushTypeEnum.ACCPET_QUERYCLAFILY.getText()+"鎺ュ彛閰嶇疆宸插仠鐢ㄦ垨鑰呮湭閰嶇疆锛岃鑱旂郴缂栫爜绠$悊鍛橈紒");
+				//鏍¢獙鏄惁閰嶇疆
+			boolean checkPass = checkIspass(systemId, SysIntegrationDataFlowTypeEnum.ACCEPT.getValue(), sysIntegrationPushTypeEnum.ACCPET_QUERYCLAFILY.getValue());
+			if (!checkPass) {
+				errorid = "101";
+				throw new Throwable("绯荤粺鏍囪瘑涓恒��" + systemId + "銆�," + sysIntegrationPushTypeEnum.ACCPET_QUERYCLAFILY.getText() + "鎺ュ彛閰嶇疆宸插仠鐢ㄦ垨鑰呮湭閰嶇疆锛岃鑱旂郴缂栫爜绠$悊鍛橈紒");
 			}
 
 			//杩欐槸璐﹀彿淇℃伅
@@ -662,12 +679,14 @@
 				msg = "鎺ュ彛鍙傛暟锛歭ibrary 涓簄ull";
 				throw new Throwable(msg);
 			}
+
 			//鏍¢獙鏄惁閰嶇疆
-			boolean checkPass= checkIspass(systemId, SysIntegrationDataFlowTypeEnum.ACCEPT.getValue(), sysIntegrationPushTypeEnum.ACCPET_QUERYDATA.getValue());
-			if(!checkPass){
-				errorid="101";
-				throw new Throwable("绯荤粺鏍囪瘑涓恒��"+systemId+"銆�,"+sysIntegrationPushTypeEnum.ACCPET_QUERYDATA.getText()+"鎺ュ彛閰嶇疆宸插仠鐢ㄦ垨鑰呮湭閰嶇疆锛岃鑱旂郴缂栫爜绠$悊鍛橈紒");
+			boolean checkPass = checkIspass(systemId, SysIntegrationDataFlowTypeEnum.ACCEPT.getValue(), sysIntegrationPushTypeEnum.ACCPET_QUERYDATA.getValue());
+			if (!checkPass) {
+				errorid = "101";
+				throw new Throwable("绯荤粺鏍囪瘑涓恒��" + systemId + "銆�," + sysIntegrationPushTypeEnum.ACCPET_QUERYDATA.getText() + "鎺ュ彛閰嶇疆宸插仠鐢ㄦ垨鑰呮湭閰嶇疆锛岃鑱旂郴缂栫爜绠$悊鍛橈紒");
 			}
+
 			//鍏堢畝绉版槸鍚︽湁鍏宠仈妯℃澘锛屾湁妯℃澘瑕佸厛鍒犻櫎
 
 			List<CodeClassify> libIdDos =classifyService.selectByWrapper(Wrappers.<CodeClassify>query().lambda().eq(CodeClassify::getId,library));
@@ -853,12 +872,13 @@
 			List<String> classifyIdList=  libraryVO.getClassifyid();
 			List<CodeClassifyVO> codeClassifyVOS =new ArrayList<>();
 
-			/*//鏍¢獙鏄惁閰嶇疆
-			boolean checkPass= checkIspass(systemId, SysIntegrationDataFlowTypeEnum.ACCEPT.getValue(), sysIntegrationPushTypeEnum.ACCPET_QUERYCLAFILYRULE.getValue());
-			if(!checkPass){
-				errorid="101";
-				throw new Throwable("绯荤粺鏍囪瘑涓恒��"+systemId+"銆�,"+sysIntegrationPushTypeEnum.ACCPET_QUERYCLAFILYRULE.getText()+"鎺ュ彛閰嶇疆宸插仠鐢ㄦ垨鑰呮湭閰嶇疆锛岃鑱旂郴缂栫爜绠$悊鍛橈紒");
-			}*/
+			//鏍¢獙鏄惁閰嶇疆
+			boolean checkPass = checkIspass(systemId, SysIntegrationDataFlowTypeEnum.ACCEPT.getValue(), sysIntegrationPushTypeEnum.ACCPET_QUERYCLAFILYRULE.getValue());
+			if (!checkPass) {
+				errorid = "101";
+				throw new Throwable("绯荤粺鏍囪瘑涓恒��" + systemId + "銆�," + sysIntegrationPushTypeEnum.ACCPET_QUERYCLAFILYRULE.getText() + "鎺ュ彛閰嶇疆宸插仠鐢ㄦ垨鑰呮湭閰嶇疆锛岃鑱旂郴缂栫爜绠$悊鍛橈紒");
+			}
+
 			//杩欐槸璐﹀彿淇℃伅
 			//杩欐槸璐﹀彿淇℃伅
 			if(userVo!=null) {
@@ -953,44 +973,206 @@
 										coderefersecSearchVO = JSONObject.toJavaObject(JSONObject.parseObject(referConfig), CoderefersecSearchVO.class);
 									}
 									String buildSqlwhere="";
-									if(coderefersecSearchVO!=null){
-										Map<String,Object> condtionMap=new HashMap<>();
-										List<CodeSrchCondConfigVO> codeSrchCondConfigVOList=coderefersecSearchVO.getCodeSrchCondConfigVOS();
+									if(coderefersecSearchVO!=null) {
+										if (coderefersecSearchVO.getType().equals(CodeReferConfigTypeEnum.DEFAULT.getValue()) || coderefersecSearchVO.getType().equals(CodeReferConfigTypeEnum.GRID.getValue())) {//榛樿鏍峰紡/鍒楄〃
+											Map<String, Object> condtionMap = new HashMap<>();
+											List<CodeSrchCondConfigVO> codeSrchCondConfigVOList = coderefersecSearchVO.getCodeSrchCondConfigVOS();
 
-										if(!CollectionUtils.isEmpty(codeSrchCondConfigVOList)) {
-											codeSrchCondConfigVOList.stream().forEach(codeSrchCondConfigVO -> {
-												condtionMap.put(codeSrchCondConfigVO.getFilterField()+codeSrchCondConfigVO.getFilterType(),codeSrchCondConfigVO.getFilterValue());
-											});
-											buildSqlwhere=	UBCSSqlKeyword.buildSqlwhere(condtionMap);
+											if (!CollectionUtils.isEmpty(codeSrchCondConfigVOList)) {
+												codeSrchCondConfigVOList.stream().forEach(codeSrchCondConfigVO -> {
+													condtionMap.put(codeSrchCondConfigVO.getFilterField() + codeSrchCondConfigVO.getFilterType(), codeSrchCondConfigVO.getFilterValue());
+												});
+												buildSqlwhere = UBCSSqlKeyword.buildSqlwhere(condtionMap);
+											}
+
+											//浣跨敤浼犲叆鐨勪笟鍔$被鍨嬫煡璇㈣〃
+											R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(referBtmId));
+											if (!listR.isSuccess() || listR.getData().size() == 0) {
+												throw new VciBaseException("浼犲叆涓氬姟绫诲瀷鏈煡璇㈠埌鐩稿簲琛ㄥ崟锛岃妫�鏌ワ紒");
+											}
+											String referTable = listR.getData().get(0).getTableName();
+											StringBuffer sb = new StringBuffer();
+											sb.append(" select * from  ");
+											sb.append(referTable);
+											sb.append(" where 1=1  ");
+											if (StringUtils.isNotBlank(buildSqlwhere)) {
+												sb.append(buildSqlwhere);
+											}
+											List<Map> ListMap = commonsMapper.selectBySql(sb.toString());
+											String valueField = coderefersecSearchVO.getValueField();
+											String textField = coderefersecSearchVO.getTextField();
+											final int[] num = {0};
+											if (!CollectionUtils.isEmpty(ListMap)) {
+												ListMap.stream().forEach(map -> {
+													num[0]++;
+													String id = map.getOrDefault("OID".toUpperCase(Locale.ROOT), "").toString();
+													String value = map.getOrDefault(valueField.toUpperCase(Locale.ROOT), "").toString();
+													String text = map.getOrDefault(textField.toUpperCase(Locale.ROOT), "").toString();
+													String description = map.getOrDefault("description".toUpperCase(Locale.ROOT), "").toString();
+													CodeSectionValueVO sectionValueVO = new CodeSectionValueVO(id, num[0] + "", value, text, "", description);
+													codeSectionValueVOList.add(sectionValueVO);
+												});
+											}
+										} else if (coderefersecSearchVO.getType().equals(CodeReferConfigTypeEnum.TREE.getValue())) {//鏍戝舰
+											Map<String, Object> condtionMap = new HashMap<>();
+
+											//浣跨敤浼犲叆鐨勪笟鍔$被鍨嬫煡璇㈣〃
+											R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(referBtmId));
+											if (!listR.isSuccess() || listR.getData().size() == 0) {
+												throw new VciBaseException("浼犲叆涓氬姟绫诲瀷鏈煡璇㈠埌鐩稿簲琛ㄥ崟锛岃妫�鏌ワ紒");
+											}
+											String referTable = listR.getData().get(0).getTableName();
+
+											String oidFieldName = StringUtils.isNotBlank(coderefersecSearchVO.getParentUsedField())?coderefersecSearchVO.getParentUsedField():coderefersecSearchVO.getValueField();
+											String parentValue =coderefersecSearchVO.getParentValue();
+											String parentFieldName =StringUtils.isBlank(coderefersecSearchVO.getParentFieldName())?"":coderefersecSearchVO.getParentFieldName();
+											List<CodeSrchCondConfigVO> codeSrchCondConfigVOList = coderefersecSearchVO.getCodeSrchCondConfigVOS();
+											List<CodeShowFieldConfigVO> codeShowFieldConfigVOS=coderefersecSearchVO.getCodeShowFieldConfigVOS();
+											if (!CollectionUtils.isEmpty(codeSrchCondConfigVOList)) {
+												codeSrchCondConfigVOList.stream().forEach(codeSrchCondConfigVO -> {
+													condtionMap.put(codeSrchCondConfigVO.getFilterField() + codeSrchCondConfigVO.getFilterType(), codeSrchCondConfigVO.getFilterValue());
+												});
+												buildSqlwhere = UBCSSqlKeyword.buildSqlwhere(condtionMap);
+											}
+
+											//if("all".equals(coderefersecSearchVO.getLoadType())) {
+											String parentOidSql = "";
+											if(StringUtils.isNotBlank(parentValue)){
+												String temp=parentValue;
+												if(temp.startsWith(QueryOptionConstant.IN)){
+													temp = temp.substring((QueryOptionConstant.IN).length()).trim();
+													parentOidSql = " in " + ((temp.startsWith("(")  && temp.endsWith(")"))?temp:"(" + temp + ")");
+												}else if(temp.startsWith(QueryOptionConstant.NOTIN)){
+													parentOidSql = " not in " + ((temp.startsWith("(")  && temp.endsWith(")"))?temp:"(" + temp + ")");
+												}else if(temp.startsWith(QueryOptionConstant.NOTEQUAL)){
+													temp = temp.substring((QueryOptionConstant.NOTEQUAL).length()).trim();
+													parentOidSql = QueryOptionConstant.NOTEQUAL +  " " + ((temp.startsWith("'")  && temp.endsWith("'"))?temp:"'" + temp + "'");
+												}else if(temp.startsWith(QueryOptionConstant.MORETHAN)){
+													temp = temp.substring((QueryOptionConstant.MORETHAN).length()).trim();
+													parentOidSql = QueryOptionConstant.MORETHAN + " " +  ((temp.startsWith("'")  && temp.endsWith("'"))?temp:"'" + temp + "'");
+												}else if(temp.startsWith(QueryOptionConstant.MORE)){
+													temp = temp.substring((QueryOptionConstant.MORE).length()).trim();
+													parentOidSql = QueryOptionConstant.MORE + " " +  ((temp.startsWith("'")  && temp.endsWith("'"))?temp:"'" + temp + "'");
+												}else if(temp.startsWith(QueryOptionConstant.LESSTHAN)){
+													temp = temp.substring((QueryOptionConstant.LESSTHAN).length()).trim();
+													parentOidSql = QueryOptionConstant.LESSTHAN + " " +  ((temp.startsWith("'")  && temp.endsWith("'"))?temp:"'" + temp + "'");
+												}else if(temp.startsWith(QueryOptionConstant.LESS)){
+													temp = temp.substring((QueryOptionConstant.LESS).length()).trim();
+													parentOidSql = QueryOptionConstant.LESS +  " " + ((temp.startsWith("'")  && temp.endsWith("'"))?temp:"'" + temp + "'");
+												}else if (temp.startsWith(QueryOptionConstant.ISNOTNULL)) {
+													parentOidSql = " is not null";
+												} else if (temp.startsWith(QueryOptionConstant.ISNULL)) {
+													parentOidSql = " is  null";
+												} else if(temp.contains("*")){
+													parentOidSql = " like " + ((temp.startsWith("'")  && temp.endsWith("'"))?temp:"'" + temp + "'").replace("*","%");
+												}else {
+													parentOidSql = " = " + ((temp.startsWith("'")  && temp.endsWith("'"))?temp:"'" + temp + "'");
+												}
+											}
+											//鏌ヨ鍏ㄩ儴鐨勪俊鎭�
+											buildSqlwhere+= " and oid  in (select oid from " +referTable + " START WITH " + coderefersecSearchVO.getParentFieldName() + " "+
+											parentOidSql +
+											" CONNECT BY PRIOR " + oidFieldName + " = " + parentFieldName + ")";
+
+											/*}else{
+												if(StringUtils.isNotBlank(coderefersecSearchVO.getParentFieldName()) && StringUtils.isNotBlank(parentValue)){
+													buildSqlwhere+=" and "+coderefersecSearchVO.getParentFieldName()+"= '"+parentValue+"'";
+												}
+											}*/
+
+											StringBuffer sb = new StringBuffer();
+											sb.append(" select * from  ");
+											sb.append(referTable);
+											sb.append(" where 1=1  ");
+											if (StringUtils.isNotBlank(buildSqlwhere)) {
+												sb.append(buildSqlwhere);
+											}
+											List<Map> ListMap = commonsMapper.selectBySql(sb.toString());
+											String valueField = coderefersecSearchVO.getValueField();
+											String textField = coderefersecSearchVO.getTextField();
+											final int[] num = {0};
+											if (!CollectionUtils.isEmpty(ListMap)) {
+												ListMap.stream().forEach(map -> {
+													num[0]++;
+													String id = map.getOrDefault("OID".toUpperCase(Locale.ROOT), "").toString();
+													String value = map.getOrDefault(valueField.toUpperCase(Locale.ROOT), "").toString();
+													String text = map.getOrDefault(textField.toUpperCase(Locale.ROOT), "").toString();
+													String description = map.getOrDefault("description".toUpperCase(Locale.ROOT), "").toString();
+													String pid = map.getOrDefault(parentFieldName.toUpperCase(Locale.ROOT), "").toString();
+													CodeSectionValueVO sectionValueVO = new CodeSectionValueVO(id, num[0] + "", value, text, pid, description);
+													codeSectionValueVOList.add(sectionValueVO);
+												});
+											}
+
+
+										} else if (coderefersecSearchVO.getType().equals(CodeReferConfigTypeEnum.ORGDEPARTMENTGRIDREFERS.getValue()) ||////閮ㄩ棬鍒楄〃
+											coderefersecSearchVO.getType().equals(CodeReferConfigTypeEnum.ORGDEPARTMENTREFER.getValue())//閮ㄩ棬鏍�
+										) {
+											R<List<DeptVO>> r = sysClient.deptList("");
+											if (r.isSuccess()) {
+												List<DeptVO> deptVOList = r.getData();
+												if (!CollectionUtils.isEmpty(deptVOList)) {
+													deptVOList.stream().forEach(deptVO -> {
+														String id = String.valueOf(deptVO.getId());
+														int num = deptVO.getSort();
+														String value = String.valueOf(deptVO.getId());
+														String text = deptVO.getDeptName();
+														String description = deptVO.getRemark();
+														String pid = deptVO.getParentId() + "";
+														CodeSectionValueVO sectionValueVO = new CodeSectionValueVO(id, num + "", value, text, pid, description);
+														codeSectionValueVOList.add(sectionValueVO);
+													});
+												}
+											}
+										} else if (coderefersecSearchVO.getType().equals(CodeReferConfigTypeEnum.SMUSERREFER.getValue())//鐢ㄦ埛
+											|| coderefersecSearchVO.getType().equals(CodeReferConfigTypeEnum.SMUSERGRIDREFER.getValue())//鐢ㄦ埛鍒楄〃
+										) {
+											R<List<User>>  r=userClient.selectAllUser();
+											if (r.isSuccess()) {
+												List<User> userList = r.getData();
+												if (!CollectionUtils.isEmpty(userList)) {
+													final int[] num = {0};
+													userList.stream().forEach(user -> {
+													 	String value=StringUtils.isBlank(user.getAccount())?"":user.getAccount();
+														//String value= String.valueOf(StringUtils.isBlank(user.getCode())?"":user.getCode());
+														String text=StringUtils.isBlank(user.getName())?"":user.getName();
+														String pid=user.getDeptId();
+														num[0]++;
+														String description="";
+														String id= String.valueOf(user.getId());
+														CodeSectionValueVO sectionValueVO = new CodeSectionValueVO(id, num[0] + "", value, text, pid, description);
+														codeSectionValueVOList.add(sectionValueVO);
+													});
+												}
+											}
+
+										} else if (coderefersecSearchVO.getType().equals(CodeReferConfigTypeEnum.SMROLEREFER.getValue())) {//瑙掕壊鍒楄〃
+
+											R<List<RoleVO>> r = sysClient.roleTree("");
+											if (r.isSuccess()) {
+												List<RoleVO> roleVOList = r.getData();
+												if (!CollectionUtils.isEmpty(roleVOList)) {
+													roleVOList.stream().forEach(roleVO -> {
+														String id = String.valueOf(roleVO.getId());
+														int num = roleVO.getSort();
+														String value = String.valueOf(roleVO.getId());
+														String text = roleVO.getRoleName();
+														String description = roleVO.getRoleAlias();
+														String pid = roleVO.getParentId() + "";
+														CodeSectionValueVO sectionValueVO = new CodeSectionValueVO(id, num + "", value, text, pid, description);
+														codeSectionValueVOList.add(sectionValueVO);
+													});
+												}
+											}
+										} else if (coderefersecSearchVO.getType().equals(CodeReferConfigTypeEnum.ORGDUTYREFER.getValue())) {//鑱屽姟
+
+
+										} else if (coderefersecSearchVO.getType().equals(CodeReferConfigTypeEnum.SMWORKTYPEREFER.getValue())) {//宸ョ
+
+
+										} else if (coderefersecSearchVO.getType().equals(CodeReferConfigTypeEnum.WFPROCESSTEMPLATEREFER.getValue())) {//娴佺▼妯℃澘
+
 										}
-									}
-									//浣跨敤浼犲叆鐨勪笟鍔$被鍨嬫煡璇㈣〃
-									R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(referBtmId));
-									if (!listR.isSuccess() || listR.getData().size() == 0) {
-										throw new VciBaseException("浼犲叆涓氬姟绫诲瀷鏈煡璇㈠埌鐩稿簲琛ㄥ崟锛岃妫�鏌ワ紒");
-									}
-									String referTable = listR.getData().get(0).getTableName();
-									StringBuffer sb=new StringBuffer();
-									sb.append(" select * from  ");
-									sb.append(referTable);
-									sb.append(" where 1=1  ");
-									if(StringUtils.isNotBlank(buildSqlwhere)){
-										sb.append( buildSqlwhere );
-									}
-									List<Map> ListMap=	commonsMapper.selectBySql(sb.toString());
-									String valueField=coderefersecSearchVO.getValueField();
-									String textField=coderefersecSearchVO.getTextField();
-									final int[] num = {0};
-									if(!CollectionUtils.isEmpty(ListMap)){
-										ListMap.stream().forEach(map->{
-											num[0]++;
-											String id= map.getOrDefault("OID".toUpperCase(Locale.ROOT),"").toString();
-											String value= map.getOrDefault(valueField.toUpperCase(Locale.ROOT),"").toString();
-											String text=map.getOrDefault(textField.toUpperCase(Locale.ROOT),"").toString();
-											String description=map.getOrDefault("description".toUpperCase(Locale.ROOT),"").toString();
-											CodeSectionValueVO sectionValueVO=new CodeSectionValueVO(id, num[0]+"",value,text,"",description);
-											codeSectionValueVOList.add(sectionValueVO);
-										});
 									}
 									log.info(libId);
 								}else if(secType.equals("codelevelsec")) {//灞傜骇鐮佹
@@ -1155,9 +1337,11 @@
 		});
 		Map<String,CodeClassifyVO> codeClassifyVOMap= classifyFullInfo.getParentClassifyVOs().stream().collect(Collectors.toMap(s -> s.getId(), t -> t,(o1, o2)->o2));
 		List<CodeOrderSecDTO> codeOrderSecDTOList=new ArrayList<>();
+		Map<String,String> errorMap=new HashMap<>();
 		for(CodeBasicSecVO codeBasicSecVO: codeBasicSecVOS) {
 			String sectype = codeBasicSecVO.getSecType();
 			String classifySecOid= codeBasicSecVO.getOid();
+			String message="";
 			if (!sectype.equals(CodeSecTypeEnum.CODE_SERIAL_SEC.getValue())) {
 				String name = codeBasicSecVO.getName();
 				String sectypeText = codeBasicSecVO.getSecTypeText();
@@ -1179,18 +1363,27 @@
 								CodeClassifyValue codeClassifyValue=   codeClassifyValueDOMap.get(sectypeValue);
 								sectypeValue=codeClassifyValue.getOid();
 							}else {
-								objerrorCode = "101";
-								throw new Throwable("浼犲叆鐨勫垎绫荤爜娈碉細銆�" + name + " 鍊硷細" + sectypeValue + "銆戯紝涓嶇鍚堝綋鍓嶅垎绫诲眰绾т唬鍙�");
+								//throw new Throwable("浼犲叆鐨勫垎绫荤爜娈碉細銆�" + name + " 鍊硷細" + sectypeValue + "銆戯紝涓嶇鍚堝綋鍓嶅垎绫诲眰绾т唬鍙�");
+								message="浼犲叆鐨勫垎绫荤爜娈碉細銆�" + name + " 鍊硷細" + sectypeValue + "銆戯紝涓嶇鍚堝綋鍓嶅垎绫诲眰绾т唬鍙�";
+								errorMap.put("error",errorMap.getOrDefault("error","")+";"+message);
 							}
 						}
+					}
+					if(StringUtils.isBlank(sectypeValue)){
+						message="浼犲叆鐨勫垎绫荤爜娈碉細銆�" + name + " 銆戠殑鍊间笉鍏佽涓虹┖";
+						errorMap.put("error",errorMap.getOrDefault("error","")+";"+message);
 					}
 					CodeOrderSecDTO.setSecValue(sectypeValue);
 					codeOrderSecDTOList.add(CodeOrderSecDTO);
 				} else {
-					objerrorCode="101";
-					throw new Throwable("浼犲叆鐨勭爜娈佃鍒欑己灏�" + name + "鐮佹");
+					message="浼犲叆鐨勭爜娈佃鍒欑己灏�" + name + "鐮佹";
+					errorMap.put("error",errorMap.getOrDefault("error","")+";"+message);
 				}
 			}
+		}
+		if(errorMap.size()>0){
+			objerrorCode="101";
+			throw new Throwable(errorMap.getOrDefault("error",""));
 		}
 		return codeOrderSecDTOList;
 	}
@@ -1394,6 +1587,9 @@
 	 * @return
 	 */
 	private boolean checkIspass(String systemId,String type,String operationType){
+		if(!CODE_CHECKCONFIG) {
+			return true;
+		}
 		//鏍规嵁绫诲瀷鍘绘煡璇㈤渶瑕侀泦鎴愮殑鍒嗙被鎴栬�呮暟鎹�
 		LambdaQueryWrapper<DockingSystemConfig> queryWrapper = Wrappers.<DockingSystemConfig>lambdaQuery();
 		queryWrapper.eq(DockingSystemConfig::getUsedFlag, MdmDuckingConstant.SEND_FLAG_TRUE);

--
Gitblit v1.9.3