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

Xgh 内容中台

See merge request !463

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

@@ -1724,7 +1724,7 @@ public class WxStaffController extends WebBaseController {
         ClerkDTO clerk = this.clerkService.getclerkById(clerkId) ;
         int clerkType = clerk.getClerkType() ;
         List<ClerkListVO> resultList = null ;
-        if(clerkType != 0) {
+        if(clerkType == 0) {
             return RestResponse.failure("-1", "非店长身份");
         }
         List<ClerkListDTO> clerkList = clerkService.getClerkByStoreId(enterpriseId, clerk.getStoreId());

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

@@ -115,7 +115,7 @@ public class QwMessageController extends WebBaseController {
         logger.info("clerkType={},ChooseAll={}",clerk.getClerkType(),qo.getChooseAll());
         int clerkType = clerk.getClerkType() ;
         if(clerkType==0) {
-            return RestResponse.failure("-1","非店长、区间");
+            return RestResponse.failure("-1","非店长、区经");
         }
         String chooseAll = qo.getChooseAll() ;
         if(StringUtils.isBlank(chooseAll) || !"1".equals(chooseAll)) {