From 594563629a879d0ae6af2a3bda7eba1c8b3f9fbb Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期五, 13 十月 2023 12:23:55 +0800
Subject: [PATCH] 接口免密登录获取缓存租户接口.
---
Source/UBCS/pom.xml | 4 ++--
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/StatusServiceImpl.java | 18 +++++++++---------
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/PasswordFreeLoginServiceImpl.java | 2 +-
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/Source/UBCS/pom.xml b/Source/UBCS/pom.xml
index e93ff76..bb74ac8 100644
--- a/Source/UBCS/pom.xml
+++ b/Source/UBCS/pom.xml
@@ -107,13 +107,13 @@
<resources>
<resource>
<directory>src/main/resources</directory>
- <excludes>
+ <!-- <excludes>
<exclude>bootstrap.yml</exclude>
<exclude>application.yml</exclude>
<exclude>application-dev.yml</exclude>
<exclude>application-test.yml</exclude>
<exclude>application-prop.yml</exclude>
- </excludes>
+ </excludes>-->
</resource>
<resource>
<directory>src/main/java</directory>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/PasswordFreeLoginServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/PasswordFreeLoginServiceImpl.java
index e5909da..37c7bbd 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/PasswordFreeLoginServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/PasswordFreeLoginServiceImpl.java
@@ -108,7 +108,7 @@
String token2 = JwtUtil.getToken(authToken);
BladeUser user = this.getUser(token2);
//涓嶅瓨鍦ㄥ氨璇锋眰
- if((Func.isEmpty(authToken) || Func.isEmpty(user)) && !NacosConfigCache.getAdminUserInfo().getTenantId().equals(user.getTenantId())){
+ if(Func.isEmpty(authToken) || Func.isEmpty(user) || !NacosConfigCache.getAdminUserInfo().getTenantId().equals(user.getTenantId())){
String responseBody = this.passwordFreeLogin(userName);
//鎷垮埌鍝嶅簲浣撳叾涓寘鍚玹oken,鐢╮equest涓殑ip鍦板潃浣滀负閿�硷紝灏唗oken瀛樺叆缂撳瓨
TokenUserObject tokenUserObject = null;
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/StatusServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/StatusServiceImpl.java
index 6f02fd1..d87ce3d 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/StatusServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/StatusServiceImpl.java
@@ -6,12 +6,8 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vci.ubcs.omd.constant.BtmTypeConstant;
-import com.vci.ubcs.omd.entity.BtmType;
-import com.vci.ubcs.omd.entity.LifeCycleRule;
-import com.vci.ubcs.omd.entity.Status;
-import com.vci.ubcs.omd.mapper.BtmTypeMapper;
-import com.vci.ubcs.omd.mapper.LifeCycleMapper;
-import com.vci.ubcs.omd.mapper.StatusMapper;
+import com.vci.ubcs.omd.entity.*;
+import com.vci.ubcs.omd.mapper.*;
import com.vci.ubcs.omd.service.IStatusService;
import com.vci.ubcs.omd.vo.BtmTypeVO;
import com.vci.ubcs.omd.vo.StatusVO;
@@ -47,7 +43,7 @@
@Resource
private BtmTypeMapper btmTypeMapper;
@Resource
- private LifeCycleMapper lifeCycleMapper;
+ private LifeCycleNodeMapper lifeCycleNodeMapper;
/**
* 鑾峰彇鐘舵�佸垪琛�
*
@@ -474,7 +470,11 @@
@Override
public List<BtmTypeVO> getApplyRange(String id) {
VciBaseUtil.alertNotNull(id,"鐘舵�佽嫳鏂囧悕绉�");
- //lifeCycleMapper.selectList(Wrappers.<LifeCycleRule>query().lambda().eq(LifeCycleRule::getStartStatus,id));
- return BtmTypeWrapper.build().listEntityVO(btmTypeMapper.selectList(Wrappers.<BtmType>query().lambda().eq(BtmType::getRevisionRuleId,id)));
+ List<LifeCycleNode> selectList = lifeCycleNodeMapper.selectList(Wrappers.<LifeCycleNode>query().lambda().eq(LifeCycleNode::getId,id));
+ List<String>lifeCycleOidList = new ArrayList<>();
+ if(!CollectionUtils.isEmpty(selectList)){
+ lifeCycleOidList = selectList.stream().map(LifeCycleNode::getLifeCycleOid).collect(Collectors.toList());
+ }
+ return BtmTypeWrapper.build().listEntityVO(btmTypeMapper.selectList(Wrappers.<BtmType>query().lambda().in(BtmType::getOid,lifeCycleOidList)));
}
}
--
Gitblit v1.9.3