From 1d6f916b5254a31a086f897acb0d4a5913a3e332 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 11 九月 2025 14:59:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmWarehouseServiceImpl.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmWarehouseServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmWarehouseServiceImpl.java
index c3ae724..48650f3 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmWarehouseServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmWarehouseServiceImpl.java
@@ -4,6 +4,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.dto.TCrmWarehouseDTO;
import com.ruoyi.system.model.TCrmWarehouse;
import com.ruoyi.system.mapper.TCrmWarehouseMapper;
@@ -79,7 +80,9 @@
user.setPhonenumber(dto.getWarehousePhone());
user.setUserName(dto.getAccount());
user.setNickName(dto.getWarehouseName());
- user.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
+ if(StringUtils.isNotEmpty(dto.getPassword())){
+ user.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
+ }
sysUserService.updateUser(user);
}
return R.ok();
--
Gitblit v1.7.1