From e863d3485d077c90988c81a756b37ef21cf4962e Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 17 十一月 2023 20:16:01 +0800
Subject: [PATCH] 后台bug修改

---
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java
index bcc1b1e..e1f7218 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java
@@ -245,8 +245,9 @@
         }
         // 运营商可以查看平台添加的优惠券应只展示使用范围为全国通用、
         // 指定城市有运营商管辖的、指定门店有运营商旗下门店
+        List<Map<String, Object>> couponListOfSearch = client.getCouponListOfSearch(ofSearch);
 
-        return client.getCouponListOfSearch(ofSearch);
+        return couponListOfSearch;
     }
 
     /**
@@ -381,9 +382,11 @@
         if(UserExt.getUser().getObjectType()==2){
             dataVo.setCompany(3);
             dataVo.setUserType(2);
+            dataVo.setCityManagerId(UserExt.getUser().getObjectId());
         }else if(UserExt.getUser().getObjectType()==3){
             dataVo.setStoreIds(UserExt.getUser().getObjectId().toString());
             dataVo.setCompany(3);
+            dataVo.setUserType(3);
         }else{
             dataVo.setUserType(1);
         }

--
Gitblit v1.7.1