From ecca9ab70a9a87bcb60977c92fbf81053b8fc1bb Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 04 九月 2024 09:17:55 +0800
Subject: [PATCH] 新增优化
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java | 37 ++++++++++++++++++++++++++++---------
1 files changed, 28 insertions(+), 9 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 d645f5f..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
@@ -4,14 +4,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.admin.entity.Franchisee;
-import com.ruoyi.admin.entity.Region;
-import com.ruoyi.admin.entity.SysUser;
-import com.ruoyi.admin.entity.UserRole;
-import com.ruoyi.admin.service.FranchiseeService;
-import com.ruoyi.admin.service.RegionService;
-import com.ruoyi.admin.service.SysUserService;
-import com.ruoyi.admin.service.UserRoleService;
+import com.ruoyi.admin.entity.*;
+import com.ruoyi.admin.service.*;
import com.ruoyi.common.core.constant.Constants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.GlobalException;
@@ -26,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;
@@ -51,6 +46,8 @@
private UserRoleService userRoleService;
@Resource
private RegionService regionService;
+ @Resource
+ private MasterWorkerService masterWorkerService;
/**
* 加盟商信息分页列表
@@ -111,6 +108,12 @@
return R.ok(Arrays.stream(franchisee.getCityCode().split(",")).collect(Collectors.toList()));
}
+ @GetMapping(value = "/getWorkPic")
+ public R<String> getWorkPic(@RequestParam("id") Integer id) {
+ MasterWorker byId = masterWorkerService.getById(id);
+ return R.ok(byId.getProfilePicture());
+ }
+
/**
* 新增加盟商信息
*
@@ -164,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())
@@ -180,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