Merge branch 'xgh_内容中台' into 'developer'

Xgh 内容中台

See merge request !433

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/content/QwMessageController.java

@@ -61,14 +61,17 @@ public class QwMessageController extends WebBaseController {
         if (CollectionUtils.isEmpty(sendMemberIds)) {
             return RestResponse.failure("-1","无会员数据");
         }
-        List<String> userIdList = new ArrayList<>();
-        if (clerk.getClerkType() > 0) {
-            userIdList = staffApiService.listBindStaffId(storeId);
-        } else {
-            userIdList.add(clerkId);
+        List<String> staffIdList = new ArrayList<>();
+        if (clerk.getClerkType() == 1) {
+            staffIdList = staffApiService.listBindStaffId(storeId);
+        } else if(clerk.getClerkType()==0) {
+            staffIdList.add(clerkId);
+        }
+        if(CollectionUtils.isEmpty(staffIdList)) {
+            return RestResponse.failure("-1","无成员数据");
         }
         JSONObject json = new JSONObject();
-        json.put("userIdList", userIdList);
+        json.put("userIdList", staffIdList);
         json.put("sendMemberIds", sendMemberIds);
         json.put("enterpriseId", enterpriseId);
         json.put("imgJson", imgJson);

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/qo/CustomerQO.java

@@ -6,7 +6,7 @@ import java.util.List;
 public class CustomerQO  implements Serializable{
     private static final long serialVersionUID = 1L;
     
-	private String chooseAll;
+	private String chooseAll = "0";
 	private String searchParams;
     private String clerkId;
 	private String enterpriseId;