Merge branch 'developer' into 'master'

Developer

See merge request !91

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

@@ -504,9 +504,16 @@ public class WxEnterpriseController extends WebBaseController{
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
 		EnterpriseDTO enterprise = enterpriseService.getEnterpriseByEid(enterpriseId);
-		if(enterprise == null || enterprise.getExpireTime() == null || enterprise.getEnabledState() == null){
+		if(enterprise == null){
             return resultResponse(HaoBanErrCode.ERR_1, false);
         }
+		if(enterprise.getExpireTime() == null){
+			if(enterprise.getEnabledState() != null && enterprise.getEnabledState() == 1){
+				return resultResponse(HaoBanErrCode.ERR_1, false);
+			}else{
+				return resultResponse(HaoBanErrCode.ERR_1, true);
+			}
+        }
 		if(enterprise.getExpireTime().getTime() > System.currentTimeMillis() && enterprise.getEnabledState() == 1){
 			return resultResponse(HaoBanErrCode.ERR_1,false);
 		}