From d7267c7e475cb544bdd0d3132fc23831cbb0a2aa Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 25 十月 2023 11:22:47 +0800
Subject: [PATCH] 运营商权限
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoachController.java | 43 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 38 insertions(+), 5 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoachController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoachController.java
index e5a6959..b2cec14 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoachController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoachController.java
@@ -1,6 +1,7 @@
package com.dsh.guns.modular.system.controller.code;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.course.feignClient.account.CityManagerClient;
import com.dsh.course.feignClient.account.CoachClient;
import com.dsh.course.feignClient.account.CoachTypeClient;
@@ -13,6 +14,8 @@
import com.dsh.guns.modular.system.model.CoachChangeStateVO;
import com.dsh.guns.modular.system.model.CoachQuery;
import com.dsh.guns.modular.system.model.Store;
+import com.dsh.guns.modular.system.model.TStore;
+import com.dsh.guns.modular.system.service.IStoreService;
import com.dsh.guns.modular.system.util.ResultUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -21,6 +24,7 @@
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.stream.Collectors;
/**
@@ -43,6 +47,7 @@
*/
@RequestMapping("")
public String index(Model model) {
+
Integer objectType = UserExt.getUser().getObjectType();
Integer objectId = UserExt.getUser().getObjectId();
List<Coach> list1=coachClient.getProvince();
@@ -50,13 +55,16 @@
List<CoachSerchVO> data = coachClient.listAll(coachQuery);
List<String> province = new ArrayList<>();
- for (Coach coach : list1) {
+
+ for (CoachSerchVO coach : data) {
province.add(coach.getProvince());
}
+ HashSet<String> set = new HashSet<String>(province);
+
String roleid = UserExt.getUser().getRoleid();
model.addAttribute("role",roleid);
model.addAttribute("data",data);
- model.addAttribute("list",province);
+ model.addAttribute("list",set);
model.addAttribute("objectType",objectType);
model.addAttribute("objectId",objectId);
return PREFIX + "TCoach.html";
@@ -67,7 +75,16 @@
@RequestMapping(value = "/getCity")
@ResponseBody
public List<Coach> getCity(String province) {
- return coachClient.getCity(province);
+ List<Coach> city = coachClient.getCity(province);
+ List<Coach> res = new ArrayList<>();
+ List<String> list = new ArrayList<>();
+ for (Coach coach : city) {
+ if (!list.contains(coach.getCity())){
+ res.add(coach);
+ list.add(coach.getCity());
+ }
+ }
+ return res;
}
/**
@@ -113,9 +130,10 @@
coach.setCity(cityManager.getCity());
coach.setCityCode(cityManager.getCityCode());
coach.setCityManagerId(objectId);
-
}
- if (coach.getDiploma().equals("")) coach.setDiploma(null);
+ if (coach.getDiploma().equals("")) {
+ coach.setDiploma(null);
+ }
if (coach.getCertificateImg().equals("") ){
coach.setCertificateImg(null);
}
@@ -230,6 +248,8 @@
/**
* 获取教练列表
*/
+ @Autowired
+ private IStoreService storeService;
@RequestMapping(value = "/list")
@ResponseBody
public List<CoachSerchVO> list(String province, String city, String name, String phone) {
@@ -238,6 +258,19 @@
coachQuery.setCity(city);
coachQuery.setName(name);
coachQuery.setPhone(phone);
+ Integer objectType = UserExt.getUser().getObjectType();
+ if (objectType == 2){
+ Integer objectId = UserExt.getUser().getObjectId();
+ List<Integer> operatorId = storeService.list(new QueryWrapper<TStore>().eq("operatorId", objectId))
+ .stream().map(TStore::getId).collect(Collectors.toList());
+ coachQuery.setStoreIds(operatorId);
+ }
+ if (objectType == 3){
+ Integer objectId = UserExt.getUser().getObjectId();
+ List<Integer> list = new ArrayList<>();
+ list.add(objectId);
+ coachQuery.setStoreIds(list);
+ }
return coachClient.listAll(coachQuery);
}
}
--
Gitblit v1.7.1