Merge branch 'feature/xgh/202504会员分组' into 'developer'

Feature/xgh/202504会员分组

See merge request !2871

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/chat/GroupChatPlanApiServiceImpl.java

@@ -114,6 +114,9 @@ public class GroupChatPlanApiServiceImpl implements GroupChatPlanApiService {
          }
         Long planId = log.getPlanId() ;
         GroupChatPlanBO plan = this.groupChatPlanService.getById(planId) ;
+        if(null == plan) {
+            return ServiceResponse.failure("9999","计划不存在或已删除") ;
+        }
         dto.setPlanName(plan.getName());
         if(dto.getSendStatus()==1) {
             if(plan.getSendFlag()==0 || plan.getEndTime().getTime() < System.currentTimeMillis()) {

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

@@ -1539,7 +1539,7 @@ public class WxStaffController extends WebBaseController {
      */
     @RequestMapping(value = "/queryMenuCodesByClerkType", method = RequestMethod.GET)
     public RestResponse<HaobanRoleDTO> queryMenuByClerkType(Integer clerkType, String staffId, String wxEnterpriseId , String enterpriseId) {
-        if(StringUtils.isBlank(wxEnterpriseId) || wxEnterpriseId.equals("-1") || StringUtils.isBlank(enterpriseId) || "-1".equals(enterpriseId)) {
+        if(StringUtils.isBlank(wxEnterpriseId) || wxEnterpriseId.equals("-1")) {
             return RestResponse.failure(Convert.toStr(HaoBanErrCode.ERR_2.getCode()), HaoBanErrCode.ERR_2.getMsg());
         }
         if (clerkType == null) {