From c036557db88c6297b9a626a892dce35c14ab8ee5 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期四, 09 十一月 2023 18:30:31 +0800
Subject: [PATCH] 11.6
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TBodySideAppointmentsController.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TBodySideAppointmentsController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TBodySideAppointmentsController.java
index 15abeb8..51a7edb 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TBodySideAppointmentsController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TBodySideAppointmentsController.java
@@ -14,6 +14,8 @@
import com.dsh.guns.config.UserExt;
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;
@@ -140,8 +142,7 @@
vo.setIds(collect);
}else if(roleType == 3){
List<Integer> list = new ArrayList<>();
- TStoreStaff storeByStoreStaffId = storeStaffClient.getStoreByStoreStaffId(objectId);
- list.add(storeByStoreStaffId.getStoreId());
+ list.add(objectId);
vo.setIds(list);
}
List<QueryBodySideAppointmentVO> queryBodySideAppointmentVOS = bodySideAppointmentClient.listAll(vo);
@@ -152,6 +153,8 @@
return queryBodySideAppointmentVOS;
}
+ @Autowired
+ private IStoreService storeService;
/**
* 添加/修改体测预约记录
*/
@@ -162,18 +165,19 @@
// 获取当前登录人id
Integer cityManagerId = UserExt.getUser().getObjectId();
if (roleType == 2){
- CityManager cityManager = cityManagerClient.queryCityManagerById(cityManagerId);
+ TStore cityManager = storeService.getById(vo.getStoreId());
vo.setProvince(cityManager.getProvince());
vo.setProvinceCode(cityManager.getProvinceCode());
vo.setCity(cityManager.getCity());
vo.setCityCode(cityManager.getCityCode());
}else if (roleType == 3){
- TStoreStaff storeByStoreStaffId = storeStaffClient.getStoreByStoreStaffId(cityManagerId);
- Store storeById = storeClient.getStoreById(storeByStoreStaffId.getStoreId());
+// TStoreStaff storeByStoreStaffId = storeStaffClient.getStoreByStoreStaffId(cityManagerId);
+ Store storeById = storeClient.getStoreById(cityManagerId);
vo.setProvince(storeById.getProvince());
vo.setProvinceCode(storeById.getProvinceCode());
vo.setCity(storeById.getCity());
vo.setCityCode(storeById.getCityCode());
+ vo.setStoreId(cityManagerId);
}
bodySideAppointmentClient.addBodySideAppointments(vo);
return ResultUtil.success("添加成功");
--
Gitblit v1.7.1