From dc9239d73b15b9a51c46a9e8d25c0d4400e613ce Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 29 七月 2024 09:17:54 +0800
Subject: [PATCH] 7.29
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 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..c872de5 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;
@@ -51,6 +45,8 @@
private UserRoleService userRoleService;
@Resource
private RegionService regionService;
+ @Resource
+ private MasterWorkerService masterWorkerService;
/**
* 加盟商信息分页列表
@@ -111,6 +107,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());
+ }
+
/**
* 新增加盟商信息
*
--
Gitblit v1.7.1