From a52f8c508d08014d1a153cfc02e12b5fc185a3a4 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 11 七月 2024 15:28:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomIAMServiceImpl.java | 38 ++++++++++++++++++++++++++------------
1 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomIAMServiceImpl.java b/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomIAMServiceImpl.java
index b89d3dc..4542b02 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomIAMServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomIAMServiceImpl.java
@@ -15,6 +15,7 @@
import com.doumee.dao.business.model.*;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
@@ -43,6 +44,12 @@
private IamInterfaceLogMapper iamInterfaceLogMapper;
@Autowired
private SegmentsMapper segmentsMapper;
+ /**
+ * 鏄惁寮�鍙戣��
+ */
+ @Value("${debug_model}")
+ private Boolean isDebug;
+
/**
* 鍒濆鍖栧悓姝ョ敤鎴�
@@ -76,10 +83,12 @@
.eq(Shop::getOrgId,model.getIdtOrgId())
.last("limit 1"));
if(shop == null){
+ shop = new Shop();
+ shop.setCreateDate(date);
addShops.add(initShopInfo(shop,model,date));
}else {
segDelOrgIds.add(shop.getOrgId());
- updateShops.add(shop);
+ updateShops.add(initShopInfo(shop,model,date));
}
//澶勭悊鍝佺被鏁版嵁閫昏緫
dealCategorySegData(date,shop,model.getCategory(),categorySegList,segmentsList);
@@ -207,15 +216,13 @@
}
private Shop initShopInfo(Shop shop, IamUpateShopModel model, Date date) {
- if(shop == null) {
- shop = new Shop();
- shop.setCreateDate(date);
- }
shop.setEditDate(date);
shop.setOrgId(model.getIdtOrgId());
shop.setName(model.getIdtOrgName());
shop.setCode(model.getIdtOrgCode());
shop.setType(model.getIdtOrgFirstLevelType());
+
+ shop.setStatus(Constants.parseIntByStr(model.getIdtOrgStatus()));
shop.setSecondType(model.getIdtOrgSecondLevelType());
shop.setAttribute(model.getIdtOrgAttribute());
if(model.getScode()!=null){
@@ -261,6 +268,9 @@
}
private void isValidToken(String uuid, String timestamp, String token) {
+ if(isDebug){
+ return;
+ }
if (!StringUtils.equalsIgnoreCase( getToken( uuid, timestamp), token)) {
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝token閿欒~");
}
@@ -294,6 +304,7 @@
users.setEditDate(new Date());
users.setSex(upateUserModel.getIdtUserGender());
users.setIamUsername(upateUserModel.getAppAccountNo());
+ users.setCode(upateUserModel.getIdtUserWorkNo());
users.setName(upateUserModel.getIdtUserName());
users.setPassword(upateUserModel.getAppAccountPwd());
users.setPhone(upateUserModel.getIdtUserMobile());
@@ -301,24 +312,27 @@
users.setStatus(upateUserModel.getAppAccountStatus());
users.setIsdeleted(Constants.ZERO);
users.setRemark(JSONObject.toJSONString(upateUserModel));
+ users.setRoleNames(null);
+ users.setRoleIds(null);
+ users.setUserTypes(null);
if( upateUserModel.getUserTypes() !=null){
for(IamUserTypeModel type : upateUserModel.getUserTypes()){
- if(StringUtils.isNotBlank(users.getUserTypes())){
+ if(StringUtils.isBlank(users.getUserTypes())){
users.setUserTypes("");
}
- users.setUserTypes("["+users.getUserTypes()+type.getIdtUserTypeCode()+"];");
+ users.setUserTypes(users.getUserTypes()+"["+type.getIdtUserTypeCode()+"];");
}
}
if( upateUserModel.getRoles() !=null){
for(IamUserRoleModel t : upateUserModel.getRoles()){
- if(StringUtils.isNotBlank(users.getRoleIds())){
+ if(StringUtils.isBlank(users.getRoleIds())){
users.setRoleIds("");
}
- if(StringUtils.isNotBlank(users.getRoleNames())){
+ if(StringUtils.isBlank(users.getRoleNames())){
users.setRoleNames("");
}
- users.setRoleIds("["+users.getRoleIds()+t.getId()+"];");
- users.setRoleNames("["+users.getRoleNames()+t.getName()+"];");
+ users.setRoleIds(users.getRoleIds()+t.getId()+"["+t.getId()+"];");
+ users.setRoleNames(users.getRoleNames()+"["+t.getName()+"];");
}
}
if(upateUserModel.getJobs()!=null){
@@ -334,7 +348,7 @@
Shop shop = shopMapper.selectOne(new QueryWrapper<Shop>().lambda()
.eq(Shop::getOrgId,orgId)
.last("limit 1"));
- users.setDepartmentId(shop.getId());
+ users.setDepartmentId(shop ==null?null:shop.getId());
}
}
--
Gitblit v1.9.3