From 2871cb99e018f6bf9e2ef76a424a1429a7c818f0 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 13 七月 2023 11:40:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java | 16 ++++++----------
1 files changed, 6 insertions(+), 10 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 cf6a899..5a02f9f 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
@@ -38,6 +38,7 @@
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;
@@ -754,21 +755,16 @@
/**
* 浣跨敤瑙勫垯鐨勪富閿幏鍙栧搴旂殑鐮佹鍐呭
*
- * @param ruleOid 瑙勫垯鐨勫唴瀹�
+ * @param conditionMap 瑙勫垯鐨勫唴瀹�
* @return 鐮佹鐨勫唴瀹�
*/
@Override
- public List<CodeBasicSecVO> listCodeBasicSecByRuleOid(String ruleOid)throws ServiceException {
- if(StringUtils.isBlank(ruleOid)){
+ public List<CodeBasicSecVO> listCodeBasicSecByRuleOid(Map<String,Object> conditionMap)throws ServiceException {
+ if(Func.isBlank(conditionMap.getOrDefault("pkCodeRule","").toString())){
return new ArrayList<>();
}
-// Map<String,String> conditionMap = new HashMap<>();
-// conditionMap.put("pkCodeRule",ruleOid);
-// PageHelper pageHelper = new PageHelper(-1);
-// pageHelper.addDefaultAsc("ordernum");
- QueryWrapper<CodeBasicSec> wrapper = new QueryWrapper<>();
- wrapper.eq("pkCodeRule",ruleOid);
- wrapper.orderByAsc("ordernum");
+ QueryWrapper<CodeBasicSec> wrapper = UBCSCondition.getQueryWrapper(conditionMap, CodeBasicSec.class);
+ wrapper.orderByAsc("orderNum");
List<CodeBasicSec> secDOList = baseMapper.selectList(wrapper);//.selectByCondition(conditionMap, pageHelper);
return codeBasicSecDO2VOs(secDOList,true);
}
--
Gitblit v1.9.3