Merge branch 'developer' into 'master'

fix

See merge request !95

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

@@ -508,13 +508,10 @@ public class WxEnterpriseController extends WebBaseController{
 		if(enterprise == null || enterprise.getExpireTime() == null || enterprise.getEnabledState() == null){
             return resultResponse(HaoBanErrCode.ERR_1, false);
         }
-		logger.info("enterprise.getEnabledState()={}",enterprise.getEnabledState() == 1);
-		if(enterprise.getExpireTime().getTime() > System.currentTimeMillis() && enterprise.getEnabledState().intValue() == 1){
+		if(enterprise.getExpireTime().getTime() > System.currentTimeMillis() && enterprise.getEnabledState() == 1){
 			return resultResponse(HaoBanErrCode.ERR_1,false);
 		}
-		if(enterprise.getEnabledState() == null || enterprise.getEnabledState() != 1){
-			return resultResponse(HaoBanErrCode.ERR_1,false);
-   		}
+		logger.info("【返回类型】overFlag={}",true);
 		return resultResponse(HaoBanErrCode.ERR_1,true);
 	}