From f52c9ecaa576145ecb097e2335b5f12acddec93b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 18 七月 2024 15:04:21 +0800
Subject: [PATCH] 提交
---
server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomIAMServiceImpl.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 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 4542b02..b59e848 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
@@ -87,7 +87,7 @@
shop.setCreateDate(date);
addShops.add(initShopInfo(shop,model,date));
}else {
- segDelOrgIds.add(shop.getOrgId());
+ segDelOrgIds.add(shop.getCode());
updateShops.add(initShopInfo(shop,model,date));
}
//澶勭悊鍝佺被鏁版嵁閫昏緫
@@ -194,7 +194,7 @@
data.setCreateDate(date);
data.setEditDate(date);
data.setIsdeleted(Constants.ZERO);
- data.setOrgId(shop.getOrgId());
+ data.setOrgId(shop.getCode());
data.setSegId(model.getSegment1());
data.setSegId2(model.getSegment2());
data.setSegId3(model.getSegment3());
@@ -313,6 +313,8 @@
users.setIsdeleted(Constants.ZERO);
users.setRemark(JSONObject.toJSONString(upateUserModel));
users.setRoleNames(null);
+ users.setRoleCodes(null);
+ users.setCardImg("-");
users.setRoleIds(null);
users.setUserTypes(null);
if( upateUserModel.getUserTypes() !=null){
@@ -331,8 +333,12 @@
if(StringUtils.isBlank(users.getRoleNames())){
users.setRoleNames("");
}
- users.setRoleIds(users.getRoleIds()+t.getId()+"["+t.getId()+"];");
+ if(StringUtils.isBlank(users.getRoleCodes())){
+ users.setRoleCodes("");
+ }
+ users.setRoleIds(users.getRoleIds()+"["+t.getId()+"];");
users.setRoleNames(users.getRoleNames()+"["+t.getName()+"];");
+ users.setRoleCodes(users.getRoleCodes()+"["+t.getCode()+"];");
}
}
if(upateUserModel.getJobs()!=null){
@@ -350,11 +356,8 @@
.last("limit 1"));
users.setDepartmentId(shop ==null?null:shop.getId());
}
-
}
-
return users;
-
}
public String getToken(String uuid,String time) {
@@ -366,7 +369,7 @@
}
@Override
@Async
- public void saveInterfaceLog(String url,String name, String token, String uuid, String timestamp, Object obj,Integer success,String respone){
+ public void saveInterfaceLog(String url,int type,String name, String token, String uuid, String timestamp, Object obj,Integer success,String respone){
Map<String,Object> map = new HashMap<>();
map.put("token",token);
map.put("uuid",uuid);
@@ -380,7 +383,7 @@
log.setName(name);
log.setIsdeleted(Constants.ZERO);
log.setRequest(JSONObject.toJSONString(map));
- log.setType(Constants.ONE);
+ log.setType(type);
log.setSuccess(success);
log.setRepose(respone);
iamInterfaceLogMapper.insert(log);
--
Gitblit v1.9.3