From 67157345fe1878681e39ec186ef37ff6b3b5c1fc Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期六, 03 八月 2024 18:07:00 +0800
Subject: [PATCH] 8.3
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java
index c872de5..b16e878 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java
@@ -20,6 +20,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
@@ -166,6 +167,10 @@
@ApiOperation(value = "修改加盟商信息", tags = {"后台-加盟商管理"})
@PostMapping(value = "/update")
public R<String> update(@RequestBody @Validated Franchisee franchisee) {
+ boolean b = false;
+ if (franchisee.getAdminPassword().equals("")){
+ b = true;
+ }
String md5Password = checkFranchisee(franchisee);
SysUser sysUser = sysUserService.lambdaQuery()
.eq(SysUser::getFranchiseeId, franchisee.getId())
@@ -182,10 +187,22 @@
// 生成sysUser账号
sysUser.setNickName(franchisee.getName());
sysUser.setAccount(franchisee.getAdminAccount());
- sysUser.setPassword(md5Password);
+ if (!b) {
+ sysUser.setPassword(md5Password);
+ }
sysUser.setIsEnable(franchisee.getIsEnable());
+
+
+
sysUserService.updateById(sysUser);
}
+ List<String> cityStr = new ArrayList<>();
+ String[] split = franchisee.getCityCode().split(",");
+ for (String s : split) {
+ Region one = regionService.lambdaQuery().eq(Region::getCode, s).one();
+ cityStr.add(one.getName());
+ }
+ franchisee.setCity(String.join(",", cityStr));
return franchiseeService.updateById(franchisee) ? R.ok() : R.fail();
}
--
Gitblit v1.7.1