From fc41b97c07249254845bf2c598763f25eb2592f7 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 24 十月 2023 21:31:47 +0800
Subject: [PATCH] 运营商权限

---
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java |   29 +++++++++++++++++++++++++++--
 1 files changed, 27 insertions(+), 2 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 66d2442..cb1350e 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";
@@ -694,6 +699,26 @@
     }
 
     @ResponseBody
+    @PostMapping("/queryStore3")
+    public ResultUtil queryStore3(){
+        List<TStore> list = storeService.list(new QueryWrapper<TStore>().select("id","name").eq("state", 1));
+//        Map<String,Integer> map = new LinkedHashMap<>();
+        List<SelectDto>  selectDtos = new ArrayList<>();
+        Map<String,Integer> map = new HashMap<>();
+//        for (TStore store : list) {
+//            SelectDto selectDto = new SelectDto();
+//            selectDto.setId(Long.valueOf(store.getId()));
+//            selectDto.setValue(store.getName());
+//               selectDtos.add(selectDto);
+//
+//        }
+//        map.put("options",selectDtos);
+
+        return new ResultUtil(0,0,null,list,null);
+    }
+
+
+    @ResponseBody
     @PostMapping("/queryStore1/")
     public ResultUtil queryStore2(){
 //        List<TStore> list = storeService.list(new QueryWrapper<TStore>().select("id","name").eq("cityCode", cityCode).eq("state", 1));

--
Gitblit v1.7.1