From 6368a855afb72f3c23eed5aedd085c55fe7a2d9f Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 25 十月 2023 10:02:43 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java
index 5a3359d..f146b76 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java
@@ -109,7 +109,9 @@
String cityCode = null;
if(objectType == 2){//城市管理员
CityManager cityManager = cityManagerClient.queryCityManagerById(objectId);
- cityCode = cityManager.getCityCode();
+ if (cityManager!=null){
+ cityCode = cityManager.getCityCode();
+ }
}
List<Map<String, Object>> list = storeService.queryProvince(cityCode);
model.addAttribute("province", list);
@@ -132,7 +134,9 @@
String cityCode = null;
if(objectType == 2){//城市管理员
CityManager cityManager = cityManagerClient.queryCityManagerById(objectId);
- cityCode = cityManager.getCityCode();
+ if (cityManager!=null){
+ cityCode = cityManager.getCityCode();
+ }
}
List<Map<String, Object>> list = storeService.queryProvince(cityCode);
model.addAttribute("province", list);
@@ -150,6 +154,7 @@
model.addAttribute("type",type);
+ model.addAttribute("objectType",objectType);
System.out.println("========type========"+type);
// if (type ==1){
// return PREFIX + "coursePackage_edit.html";
@@ -643,13 +648,22 @@
Integer objectType = UserExt.getUser().getObjectType();
Integer objectId = UserExt.getUser().getObjectId();
String cityCode = null;
- if(objectType == 2){//城市管理员
- CityManager cityManager = cityManagerClient.queryCityManagerById(objectId);
- cityCode = cityManager.getCityCode();
- }
+// if(objectType == 2){//城市管理员
+// CityManager cityManager = cityManagerClient.queryCityManagerById(objectId);
+// cityCode = cityManager.getCityCode();
+// }
System.out.println("======="+storeService.queryCity(code, cityCode));
// return storeService.queryCity(code, cityCode);
return new ResultUtil(0,null,null,storeService.queryCity(code, cityCode),null);
+ }
+
+ @ResponseBody
+ @PostMapping("/queryCity3")
+ public ResultUtil queryCity3(){
+
+ System.out.println("======="+storeService.queryCity1());
+// return storeService.queryCity(code, cityCode);
+ return new ResultUtil(0,null,null,storeService.queryCity1(),null);
}
@@ -1083,7 +1097,7 @@
* @return
*/
@ResponseBody
- @PostMapping("/queryWalkInStudentList")
+ @PostMapping("/queryWalkInStudentListqueryCoursePackageLists")
public Object queryWalkInStudentList(Long coursePackageSchedulingId, String userName, String studentName){
Page<Map<String, Object>> page = coursePackageService.queryWalkInStudentList(coursePackageSchedulingId, userName, studentName);
return super.packForBT(page);
--
Gitblit v1.7.1