From 8198de5cf4f4bccf44b789b895980569307a5ceb Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期四, 14 十二月 2023 10:18:44 +0800
Subject: [PATCH] 修改库管员角色关联
---
consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java | 54 +++++++++++++-------------
consum-base/src/main/java/com/consum/base/service/BaseWarehouseManagerService.java | 7 ++-
consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseManagerServiceImpl.java | 12 +++++-
3 files changed, 42 insertions(+), 31 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
index 7ee165a..8bbd0d5 100644
--- a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
@@ -37,6 +37,7 @@
import com.consum.base.pojo.response.FinSysTenantUserVO;
import com.consum.base.pojo.response.FinSysTenantVO;
import com.consum.base.pojo.response.UserVO;
+import com.consum.base.service.BaseWarehouseManagerService;
import com.consum.base.service.FinSysTenantDepartmentService;
import com.consum.base.service.FinSysTenantService;
import com.consum.base.service.FinSysTenantUserService;
@@ -87,16 +88,15 @@
private FinSysTenantDepartmentService finSysTenantDepartmentService;
@Autowired
- public void setUserService(UserServiceImpl userService) {
- this.userService = userService;
- }
+ private BaseWarehouseManagerService baseWarehouseManagerService;
@Autowired
public FinSysTenantUserController(FinSysTenantService finSysTenantService,
- FinSysTenantUserService finSysTenantUserService, RoleServiceImpl roleService) {
+ FinSysTenantUserService finSysTenantUserService, RoleServiceImpl roleService, UserServiceImpl userService) {
this.finSysTenantUserService = finSysTenantUserService;
this.finSysTenantService = finSysTenantService;
this.roleService = roleService;
+ this.userService = userService;
}
/**
@@ -198,13 +198,7 @@
// 鏄惁鍒犻櫎 0鏄� 1鍚�
tenantUser.setIsDelete(0);
tenantUser.setSysUserId(NumberGenerator.getLongSequenceNumber());
- // 鍔犲瘑鎵嬫満鍙�
- String key = PlatformRSAUtils.AES_KEY;
- String encPhone = "";
- if (tenantUser.getUserPhone() != null) {
- encPhone = AESUtils.encryptStrAES(tenantUser.getUserPhone(), key);
- }
- tenantUser.setUserPhone(encPhone);
+ setUserPhone(tenantUser, tenantUser.getUserPhone());
String tenantId = tenantUser.getTenantId();
FinSysTenant finSysTenant = finSysTenantService.selectById(Long.valueOf(tenantId));
tenantUser.setTenantCode(finSysTenant.getCode());
@@ -219,6 +213,16 @@
tenantUser.setSysDeptId(2l);
}
+ }
+
+ private void setUserPhone(FinSysTenantUser tenantUser, String userPhone) {
+ // 鍔犲瘑鎵嬫満鍙�
+ String key = PlatformRSAUtils.AES_KEY;
+ String encPhone = "";
+ if (tenantUser.getUserPhone() != null) {
+ encPhone = AESUtils.encryptStrAES(userPhone, key);
+ }
+ tenantUser.setUserPhone(encPhone);
}
private S_user_core getsUserCore(FinSysTenantUser tenantUser) {
@@ -334,9 +338,7 @@
user.setSysUserId(NumberGenerator.getLongSequenceNumber());
user.setRemark("鎵归噺瀵煎叆");
// 鍔犲瘑鎵嬫満鍙�
- String key = PlatformRSAUtils.AES_KEY;
- String encPhone = AESUtils.encryptStrAES(data.getUserPhone(), key);
- user.setUserPhone(encPhone);
+ setUserPhone(user, data.getUserPhone());
user.setIsDelete(1);
// 鎬庝箞鑾峰彇宸︿晶鏈烘瀯鏍戞暟鎹�
@@ -421,12 +423,7 @@
if (tenantUser == null) {
return ResponseValue.error("鍙傛暟涓虹┖");
}
- String key = PlatformRSAUtils.AES_KEY;
- String encPhone = "";
- if (tenantUser.getUserPhone() != null) {
- encPhone = AESUtils.encryptStrAES(tenantUser.getUserPhone(), key);
- }
- tenantUser.setUserPhone(encPhone);
+ setUserPhone(tenantUser, tenantUser.getUserPhone());
// 1.鏇存柊绯荤粺鐢ㄦ埛 FIN_SYS_TENANT_USER
finSysTenantUserService.update(tenantUser);
// 2.鏇存柊骞冲彴鐢ㄦ埛 S_USER_CORE
@@ -442,8 +439,12 @@
// 鍏堝垹闄ゅ啀娣诲姞
if (!CollectionUtils.isEmpty(list)) {
finSysTenantUserService.execDelRoleUserList(sysUserId);
+ // 鍒犻櫎搴撶鍛樹俊鎭褰�
+ list.stream().filter(item -> "浠撳簱绠＄悊鍛�".equals(item.getRole_name())).findFirst()
+ .ifPresent(item -> baseWarehouseManagerService.deleteMangerBySysUserId(sysUserId));
}
if (!CollectionUtils.isEmpty(roleList)) {
+ // 鍥犱负涓嶇煡閬撹鐢ㄦ埛闇�瑕佺鐞嗛偅涓粨搴� 鏁呬笉鏂板浠撳簱绠＄悊鍛樹俊鎭紝鍙坊鍔犺鑹�
finSysTenantUserService.execInsertRoleUserList(roleList, sysUserId);
}
this.getFinSysTenantUserCache().remove(sysUserId.toString());
@@ -624,7 +625,11 @@
List<Long> roleList = user.getRoleList();
// 鍏堝垹闄ゅ啀娣诲姞
if (list != null && list.size() > 0) {
- finSysTenantUserService.execDelRoleUserList(user.getSysUserId());
+ Long sysUserId = user.getSysUserId();
+ finSysTenantUserService.execDelRoleUserList(sysUserId);
+ // 鍒犻櫎搴撶鍛樹俊鎭褰�
+ list.stream().filter(item -> "浠撳簱绠＄悊鍛�".equals(item.getRole_name())).findFirst()
+ .ifPresent(item -> baseWarehouseManagerService.deleteMangerBySysUserId(sysUserId));
}
if (roleList != null && roleList.size() > 0) {
finSysTenantUserService.execInsertRoleUserList(roleList, user.getSysUserId());
@@ -719,12 +724,7 @@
updUser.setEmail(userParam.getEmail());
updUser.setUserName(userParam.getUserName());
updUser.setSex(userParam.getSex());
- String encPhone = "";
- if (userParam.getUserPhone() != null) {
- String key = PlatformRSAUtils.AES_KEY;
- encPhone = AESUtils.encryptStrAES(userParam.getUserPhone(), key);
- }
- updUser.setUserPhone(encPhone);
+ setUserPhone(updUser, userParam.getUserPhone());
// 1.鏇存柊绯荤粺鐢ㄦ埛 FIN_SYS_TENANT_USER
finSysTenantUserService.update(updUser);
// 2.鏇存柊骞冲彴鐢ㄦ埛 S_USER_CORE
diff --git a/consum-base/src/main/java/com/consum/base/service/BaseWarehouseManagerService.java b/consum-base/src/main/java/com/consum/base/service/BaseWarehouseManagerService.java
index 2e49b94..06a1af1 100644
--- a/consum-base/src/main/java/com/consum/base/service/BaseWarehouseManagerService.java
+++ b/consum-base/src/main/java/com/consum/base/service/BaseWarehouseManagerService.java
@@ -1,10 +1,11 @@
package com.consum.base.service;
+import java.util.List;
+import java.util.Set;
+
import com.consum.base.pojo.request.WarehouseManagerParam;
import com.consum.model.po.BaseWarehouseManager;
import com.walker.jdbc.service.BaseService;
-import java.util.List;
-import java.util.Set;
public interface BaseWarehouseManagerService extends BaseService {
@@ -13,4 +14,6 @@
List<BaseWarehouseManager> selectWarehouseManager(Long warehouseId);
List<BaseWarehouseManager> selectManagerList(Long warehouseId, Long agencyId);
+
+ void deleteMangerBySysUserId(Long sysUserId);
}
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseManagerServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseManagerServiceImpl.java
index c4c714c..544a523 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseManagerServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseManagerServiceImpl.java
@@ -98,8 +98,8 @@
}
Long sysUserId = finSysTenantUser.getSysUserId();
// 鍏堝垽鏂槸鍚︽嫢鏈夎瑙掕壊
- String isHasRole = "select * from s_role_user where org_id=0 and role_id=" + roleId
- + " and user_id=" + sysUserId;
+ String isHasRole =
+ "select * from s_role_user where org_id=0 and role_id=" + roleId + " and user_id=" + sysUserId;
List<Map<String, Object>> isHasRoleList = this.select(isHasRole, new HashMap<>());
if (!CollectionUtils.isEmpty(isHasRoleList)) {
continue;
@@ -142,4 +142,12 @@
return select;
}
+ @Override
+ public void deleteMangerBySysUserId(Long sysUserId) {
+ String sql = "delete from base_warehouse_manager where MANAGER_ID =:sysUserId";
+ Map<String, Object> params = new HashMap<>();
+ params.put("sysUserId", sysUserId);
+ this.execute(sql, params);
+ }
+
}
--
Gitblit v1.9.1