From 744171debef6aee198be296520f0b86dc1586723 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 02 八月 2023 20:02:08 +0800
Subject: [PATCH] 提交代码
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java | 22 +++++++++-------------
1 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java
index c69312c..c19a4ca 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java
@@ -3,7 +3,6 @@
import com.alibaba.cloud.commons.lang.StringUtils;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -18,9 +17,7 @@
import com.vci.ubcs.code.mapper.CodeFixedValueMapper;
import com.vci.ubcs.code.service.*;
import com.vci.ubcs.code.vo.CodeReferConfigVO;
-import com.vci.ubcs.code.vo.pagemodel.CodeBasicSecVO;
-import com.vci.ubcs.code.vo.pagemodel.CodeFixedValueVO;
-import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
+import com.vci.ubcs.code.vo.pagemodel.*;
import com.vci.ubcs.code.wrapper.CodeBasicSecWrapper;
import com.vci.ubcs.omd.cache.EnumCache;
import com.vci.ubcs.omd.enums.EnumEnum;
@@ -30,7 +27,6 @@
import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
import com.vci.ubcs.starter.util.UBCSCondition;
import com.vci.ubcs.starter.util.UBCSSqlKeyword;
-import com.vci.ubcs.starter.web.enumpck.NewAppConstantEnum;
import com.vci.ubcs.starter.web.enumpck.OsCodeFillTypeEnum;
import com.vci.ubcs.starter.web.pagemodel.*;
import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
@@ -39,13 +35,10 @@
import com.vci.ubcs.system.entity.DictBiz;
import com.vci.ubcs.system.feign.IDictBizClient;
import org.springblade.core.log.exception.ServiceException;
-import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
-import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -309,7 +302,7 @@
List<TableColVO> uiTableFieldVOs = new ArrayList<>();
// 蹇�熸煡璇㈠垪
List<TableColVO> queryColumns = new ArrayList<>();
- if(!codeReferConfig.getCodeShowFieldConfigVOS().isEmpty()){
+ if(!CollectionUtils.isEmpty(codeReferConfig.getCodeShowFieldConfigVOS())){
codeReferConfig.getCodeShowFieldConfigVOS().stream().forEach(showField ->{
TableColVO tableColVO = new TableColVO();
BeanUtil.copy(showField,tableColVO);
@@ -330,7 +323,7 @@
HashMap<String, String> whereMap = new HashMap<>();
if(!codeReferConfig.getCodeSrchCondConfigVOS().isEmpty()){
codeReferConfig.getCodeSrchCondConfigVOS().stream().forEach(srch->{
- whereMap.put(srch.getFilterField()+"_"+srch.getFilterType(),srch.getFilterValue());
+ whereMap.put(srch.getFilterField()+srch.getFilterType(),srch.getFilterValue());
});
}
uiFormReferVO.setWhere(whereMap);
@@ -545,7 +538,7 @@
return null;
}
conditionMap.put("secType",(CodeSecTypeEnum.CODE_CLASSIFY_SEC.getValue()));
- return refDataGridCodeBasicSec(query.setAscs("ordernum"),conditionMap);
+ return refDataGridCodeBasicSec(query.setAscs("orderNum"),conditionMap);
}
/**
@@ -759,7 +752,6 @@
return codeBasicSecDO;
}
-
/**
* 浣跨敤瑙勫垯鐨勪富閿幏鍙栧搴旂殑鐮佹鍐呭
*
@@ -863,7 +855,10 @@
CodeBasicSec codeBasicSec = codeBasicSecMapper.selectOne(Wrappers.<CodeBasicSec>query().lambda()
.eq(CodeBasicSec::getOid, codeBasicSecDO.getParentClassifySecOid())
.eq(CodeBasicSec::getSecType, codeBasicSecDO.getSecType()));
- codeBasicSecVO.setParentClassifySecText(codeBasicSec.getName());
+ if(Func.isNotEmpty(codeBasicSec)){
+ codeBasicSecVO.setParentClassifySecOid(codeBasicSec.getOid());
+ codeBasicSecVO.setParentClassifySecText(codeBasicSec.getName());
+ }
}
//濡傛灉鏈塴cstatus鐨勭被鐨勮瘽
if (true) {
@@ -872,4 +867,5 @@
}
return codeBasicSecVO;
}
+
}
--
Gitblit v1.9.3