From b268fd73f060108b8214ed1afcbbf03480435f3a Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期五, 15 十二月 2023 17:27:41 +0800
Subject: [PATCH] 1.出库手续回显 2.调拨申请时库存查询更换接口 3.调拨出库时从已有物品所在的仓库中选择
---
consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java | 62 +++++++++++++++---------------
1 files changed, 31 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..51092ab 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());
@@ -216,9 +210,19 @@
tenantUser.setTenantCode(sysInfo.getTenantCode());
tenantUser.setTenantId(sysInfo.getTenantId());
// 杩愮淮绠＄悊
- tenantUser.setSysDeptId(2l);
+ tenantUser.setSysDeptId(2L);
}
+ }
+
+ private void setUserPhone(FinSysTenantUser tenantUser, String userPhone) {
+ // 鍔犲瘑鎵嬫満鍙�
+ String key = PlatformRSAUtils.AES_KEY;
+ String encPhone = "";
+ if (StringUtils.isNotEmpty(userPhone)) {
+ 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());
@@ -584,7 +585,7 @@
// 鏌ヨ鐖剁被鐨刼rgcode 闇�瑕佸皢鑷繁鐨刼rg鍏堟煡鍑烘潵 鍐嶆牴鎹畃arentid 鏌ョ埗绫�
String tenantId = sysInfo.getTenantId();
- if (tenantId != null && !tenantId.equals("")) {
+ if (StringUtils.isNotEmpty(tenantId)) {
List<FinSysTenant> select = finSysTenantService.select(new FinSysTenant(Long.valueOf(tenantId)));
if (select != null && select.size() > 0) {
FinSysTenant finSysTenant = select.get(0);
@@ -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());
@@ -710,21 +715,16 @@
return ResponseValue.error("鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
String avatar = userParam.getAvatar();
- if (!picFormatArr.contains(avatar.substring(avatar.lastIndexOf(".")))) {
+ if (StringUtils.isNotEmpty(avatar) && !picFormatArr.contains(avatar.substring(avatar.lastIndexOf(".")))) {
return ResponseValue.error("澶村儚鏍煎紡涓嶅厑璁�");
}
FinSysTenantUser updUser = new FinSysTenantUser();
updUser.setId(sysInfo.getId());
- updUser.setAvatar(userParam.getAvatar());
+ updUser.setAvatar(avatar);
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
--
Gitblit v1.9.1