From 565547a1d026a9bcff26f3e0edaf079bdb7a55d4 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期四, 26 十月 2023 08:55:52 +0800
Subject: [PATCH] 10.26

---
 cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java
index d122000..d001de6 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java
@@ -287,11 +287,14 @@
                 Object endTime = stringObjectMap.get("endTime");
                 stringObjectMap.put("timeValue",startTime + "至"+endTime);
                 Integer publisherType = (Integer) stringObjectMap.get("publisherType");
-                if ( publisherType == 1) {
-                    Integer cityManagerId = (Integer) stringObjectMap.get("cityManagerId");
-                    TCityManager byId = citClient.getById(cityManagerId);
-                    stringObjectMap.put("province", byId.getProvince());
-                    stringObjectMap.put("city", byId.getCity());
+                if (publisherType!=null) {
+                    if (publisherType == 1) {
+                        Integer cityManagerId = (Integer) stringObjectMap.get("cityManagerId");
+                        TCityManager byId = citClient.getById(cityManagerId);
+                        stringObjectMap.put("province", byId.getProvince());
+
+                        stringObjectMap.put("city", byId.getCity());
+                    }
                 }
             }
         }

--
Gitblit v1.7.1