From bfa2d1307c6faea916088a40dc09a360b17f7499 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期五, 30 六月 2023 18:04:33 +0800
Subject: [PATCH] 1、主要对查询返回数据进行联查
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java | 29 +++++++++++++----------------
1 files changed, 13 insertions(+), 16 deletions(-)
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 42cad8e..94a1eef 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
@@ -19,6 +19,7 @@
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
import com.vci.ubcs.code.vo.pagemodel.CodeKeyAttrRepeatRuleVO;
import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
+import com.vci.ubcs.core.log.exception.ServiceException;
import com.vci.ubcs.omd.cache.EnumCache;
import com.vci.ubcs.omd.enums.EnumEnum;
import com.vci.ubcs.omd.feign.IBtmTypeClient;
@@ -47,7 +48,6 @@
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 org.springblade.core.mp.support.Condition;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
@@ -131,11 +131,11 @@
if(StringUtils.isNotBlank(codeClassifyEntity.getParentCodeClassifyOid()) && StringUtils.isNotBlank(codeClassifyEntity.getBtmTypeId())){
return R.fail("鍙湁鍦ㄩ《灞傜殑涓婚搴撳垎绫绘墠鑳借缃笟鍔＄被鍨�");
}
- codeClassifyEntity.setCreator(AuthUtil.getUser().getUserName());
+ codeClassifyEntity.setCreator(String.valueOf(AuthUtil.getUser().getUserId()));
codeClassifyEntity.setCreateTime(new Date());
codeClassifyEntity.setTs(new Date());
- codeClassifyEntity.setOwner(AuthUtil.getUser().getUserName());
- codeClassifyEntity.setLastModifier(AuthUtil.getUser().getUserName());
+ codeClassifyEntity.setOwner(String.valueOf(AuthUtil.getUser().getUserId()));
+ codeClassifyEntity.setLastModifier(String.valueOf(AuthUtil.getUser().getUserId()));
codeClassifyEntity.setLastModifyTime(new Date());
codeClassifyEntity.setRevisionSeq(1);
codeClassifyEntity.setVersionSeq(1);
@@ -154,20 +154,17 @@
return R.fail("浼犲叆鏁版嵁涓嶈兘涓虹┖锛�");
}
//妫�鏌s
- Map<String,Object> condition = new HashMap<>(2);
- condition.put("oid",codeClassifyEntity.getOid());
- condition.put("ts",codeClassifyEntity.getTs());
- CodeClassify detail = codeClassifyMapper
- .selectOne(Condition.getQueryWrapper(condition,CodeClassify.class));
- if(detail == null){//涓嶆槸鏈�鏂扮殑涓嶈鏀�
+ CodeClassify detail = codeClassifyMapper.selectById(codeClassifyEntity.getOid());
+ if(!detail.getTs().toString().equals(codeClassifyEntity.getTs().toString())){//涓嶆槸鏈�鏂扮殑涓嶈鏀�
return R.fail("褰撳墠鏁版嵁涓嶆槸鏈�鏂帮紝璇峰埛鏂板悗鍐嶄慨鏀癸紒");
}
if(StringUtils.isNotBlank(codeClassifyEntity.getParentCodeClassifyOid()) && StringUtils.isNotBlank(codeClassifyEntity.getBtmTypeId())){
return R.fail("鍙湁鍦ㄩ《灞傜殑涓婚搴撳垎绫绘墠鑳借缃笟鍔＄被鍨�");
}
- codeClassifyEntity.setLastModifier(AuthUtil.getUser().getUserName());
+ codeClassifyEntity.setLastModifier(String.valueOf(AuthUtil.getUser().getUserId()));
codeClassifyEntity.setLastModifyTime(new Date());
+ codeClassifyEntity.setTs(new Date());
int insertNumber = codeClassifyMapper.updateById(codeClassifyEntity);
// //澶勭悊鏁版嵁闆嗘垚閫昏緫,鎴愬姛鍚庢墽琛岄泦鎴愮涓�姝�,鍒嗙被鏁版嵁鐗规畩澶勭悊銆傚彧鏈夊惎鐢ㄧ姸鎬佺殑鍒嗙被鎵嶆帹閫�
@@ -204,7 +201,7 @@
*/
private CodeClassify selectByOid(String oid){
- CodeClassify codeClassifyEntity = codeClassifyMapper.selectById(oid.trim());
+ CodeClassify codeClassifyEntity = codeClassifyMapper.selectClassifyByKeyAndReseRel("'"+oid.trim()+"'").get(0);
if(codeClassifyEntity == null || StringUtils.isBlank(codeClassifyEntity.getOid())){
throw new ServiceException("dataOidNotExist");//鏍规嵁涓婚敭id鏈煡鍒扮浉鍏虫暟鎹�
}
@@ -354,7 +351,7 @@
codeClassify.setLcStatus(lcStatus);
codeClassify.setTs(new Date());
codeClassify.setLastModifyTime(new Date());
- codeClassify.setLastModifier(AuthUtil.getUser().getUserName());
+ codeClassify.setLastModifier(String.valueOf(AuthUtil.getUser().getUserId()));
//鍚敤銆佸仠鐢�
// int u = codeClassifyMapper.updateLcStatus(oid,lcStatus);
int count = codeClassifyMapper.updateById(codeClassify);
@@ -900,9 +897,9 @@
classifyDO.setTs(new Date());
classifyDO.setBtmname("codeclassify");
classifyDO.setLcStatus("Enabled");
- classifyDO.setOwner(AuthUtil.getUser().getUserName());
- classifyDO.setCreator(AuthUtil.getUser().getUserName());
- classifyDO.setLastModifier(AuthUtil.getUser().getUserName());
+ classifyDO.setOwner(String.valueOf(AuthUtil.getUser().getUserId()));
+ classifyDO.setCreator(String.valueOf(AuthUtil.getUser().getUserId()));
+ classifyDO.setLastModifier(String.valueOf(AuthUtil.getUser().getUserId()));
classifyDO.setLastModifyTime(new Date());
codeClassifyMapper.insert(classifyDO);
}
--
Gitblit v1.9.3