From 5b1489deefbbe839ab14646b1dab4a1286b9a41e Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期二, 20 六月 2023 17:35:07 +0800
Subject: [PATCH] 1、将xml中的/符号改为#以防止后续问题。 2、对查询返回值缺少的问题进行了处理。
---
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/constant/BtmTypeFieldConstant.java | 2 +-
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml | 17 ++++++++++++++++-
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java | 6 +++---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java | 3 +++
4 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/constant/BtmTypeFieldConstant.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/constant/BtmTypeFieldConstant.java
index 4b6d441..dd693ee 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/constant/BtmTypeFieldConstant.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/constant/BtmTypeFieldConstant.java
@@ -70,7 +70,7 @@
this.put("lastmodifytime", "鏈�鍚庝慨鏀规椂闂�");
this.put("ts", "鏃堕棿鎴�");
this.put("owner", "鎷ユ湁鑰�");
- this.put("tenentId","绉熸埛");
+ this.put("tenant_id","绉熸埛");
}
};
BASE_MODEL_COMPATIBILITY_MAP = new HashMap() {
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java
index f6ecf27..4f1778a 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java
@@ -114,4 +114,7 @@
List<CodeClassify> selectByFieldNamePath(@Param("fieldPath") String fieldPath,@Param("fieldName") String fieldName);
public List<CodeClassifyVO> getIdPathToNamePathByParentId(@Param("parentId")String parentId);
+
+
+ CodeClassify selectByIdRel(@Param("oid") String oid);
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
index a943f7b..30e9cbd 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
@@ -47,7 +47,7 @@
import org.slf4j.LoggerFactory;
import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.launch.constant.AppConstant;
-import org.springblade.core.log.exception.ServiceException;
+import com.vci.ubcs.core.log.exception.ServiceException;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
@@ -1084,10 +1084,10 @@
*/
@Override
public CodeClassifyVO getObjectByIdPath(String idPath) {
- List<Map<String, Object>> idPathValues = codeClassifyMapper.selectByFieldPath("/" + idPath);
+ List<Map<String, Object>> idPathValues = codeClassifyMapper.selectByFieldPath("#" + idPath);
CodeClassify classifyDO = null;
if (idPathValues != null){
- classifyDO = codeClassifyMapper.selectById(idPathValues.get(0).get("oid").toString());
+ classifyDO = codeClassifyMapper.selectByIdRel(idPathValues.get(0).get("OID").toString());
}
return codeClassifyDO2VO(classifyDO);
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
index ee1922b..027e480 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
@@ -147,6 +147,21 @@
CONNECT BY PRIOR codeclassify0.OID = codeclassify0.parentCodeClassifyOid
</select>
+ <select id="selectByIdRel" resultMap="plCodeClassifyResultMap">
+ select pc.*,
+ pk.name codeKeyAttrRepeatOidName,
+ pr.name codeResembleRuleOidName,
+ pu.name coderuleoidName
+ from pl_code_classify pc
+ left join pl_code_keyattrrepeat pk
+ on pc.codekeyattrrepeatoid = pk.oid
+ left join pl_code_resemblerule pr
+ on pc.coderesembleruleoid = pr.oid
+ left join pl_code_rule pu
+ on pc.coderuleoid = pu.oid
+ where pc.oid = #{oid}
+ </select>
+
<select id="selectAllLevelParentByOid" resultType="java.util.HashMap">
select oid,
level from pl_code_classify start with oid= #{oid} connect by prior PARENTCODECLASSIFYOID = oid
@@ -224,7 +239,7 @@
<select id="selectByFieldPath" resultType="java.util.HashMap">
select *
- from (select oid, SYS_CONNECT_BY_PATH(id, '/') as paths
+ from (select oid, SYS_CONNECT_BY_PATH(id, '#') as paths
from pl_code_classify
START WITH parentCodeClassifyOid is null
CONNECT BY PRIOR OID = parentCodeClassifyOid) a
--
Gitblit v1.9.3