Merge branch 'master-xgh-好办停用' into 'developer'

好办停用

See merge request !232

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

@@ -295,7 +295,9 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
         String msg = "好办服务已到期";
         if (count == 1) {
             msg = this.getEndDate(list.get(0).getEnterpriseId()) ;
-            return ServiceResponse.failure("2000", msg);
+            if(null != msg) {
+                return ServiceResponse.failure("2000", msg);
+            }
         } else {
             boolean flag = false ;
             for(TabHaobanWxEnterpriseRelated item : list) {
@@ -307,8 +309,8 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
             if(!flag) {
                 return ServiceResponse.failure("3000", msg);
             }
-            return ServiceResponse.success() ;
         }
+        return ServiceResponse.success() ;
     }
 
     @Override