Merge branch 'feature/xgh/2406企微托管' into 'developer'

Feature/xgh/2406企微托管

See merge request !1908

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/open/QywxOpenTaskController.java

@@ -433,12 +433,18 @@ public class QywxOpenTaskController {
         }
         String s3 = "";
         if ("指定门店".equals(name)) {
-            s3 = this.getStore(oldJson.getString("storeId"), newJson.getString("storeId"));
+            s3 = this.getStore(oldJson.getString("store"), newJson.getString("store"));
         }
         return s1 + s3 + s2;
     }
 
     private String getStore(String oldStoreId, String newStoreId) {
+        if (null == oldStoreId) {
+            oldStoreId = "";
+        }
+        if (null == newStoreId) {
+            newStoreId = "";
+        }
         if (!oldStoreId.equals(newStoreId)) {
             String oldName = "--";
             if (StringUtils.isNotBlank(oldStoreId)) {