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 | 6 +++---
1 files changed, 3 insertions(+), 3 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 42f11ce..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
@@ -219,7 +219,7 @@
// 鍔犲瘑鎵嬫満鍙�
String key = PlatformRSAUtils.AES_KEY;
String encPhone = "";
- if (tenantUser.getUserPhone() != null) {
+ if (StringUtils.isNotEmpty(userPhone)) {
encPhone = AESUtils.encryptStrAES(userPhone, key);
}
tenantUser.setUserPhone(encPhone);
@@ -715,12 +715,12 @@
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());
--
Gitblit v1.9.1