From 34e64f1437ed897056bed0c3851e7a46ac220423 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 18 九月 2025 18:01:57 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmSalespersonServiceImpl.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmSalespersonServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmSalespersonServiceImpl.java
index 0ae0e21..44b5426 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmSalespersonServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmSalespersonServiceImpl.java
@@ -8,6 +8,7 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.dto.TCrmSalespersonDTO;
+import com.ruoyi.system.export.TCrmSalespersonExport;
import com.ruoyi.system.mapper.TCrmSalespersonMapper;
import com.ruoyi.system.model.TCrmBranch;
import com.ruoyi.system.model.TCrmBranchArea;
@@ -86,7 +87,9 @@
user.setPhonenumber(dto.getPhone());
user.setUserName(dto.getPhone());
user.setNickName(dto.getSalespersonName());
- user.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
+ if(StringUtils.isNotEmpty(dto.getPassword())){
+ user.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
+ }
sysUserService.updateUser(user);
}
return R.ok();
@@ -102,4 +105,10 @@
return this.count(Wrappers.lambdaQuery(TCrmSalesperson.class).eq(TCrmSalesperson::getSalespersonName, dto.getSalespersonName())) > 0;
}
}
+
+ @Override
+ public List<TCrmSalespersonExport> listExport(TCrmSalespersonQuery query) {
+ List<TCrmSalespersonExport> list = this.baseMapper.listExport(query);
+ return list;
+ }
}
--
Gitblit v1.7.1