gic运营平台商户显示过滤运维账户权限

gic-platform-operation-web/src/main/java/com/gic/operation/web/controller/EnterpriseController.java

@@ -6,23 +6,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.gic.auth.constant.UserConstants;
-import com.gic.authcenter.security.core.dto.EnterpriseTempDTO;
-import com.gic.authcenter.security.core.dto.UserDetailsVO;
-import com.gic.enterprise.dto.EnterpriseResourceRelDTO;
-import com.gic.enterprise.error.ErrorCode;
-import com.gic.enterprise.qo.EnterpriseQO;
-import com.gic.enterprise.utils.AutoCreatePasswordUtils;
-import com.gic.enterprise.utils.UserDetailUtils;
-import com.gic.finance.constant.EnterprisePlatformTypeEnum;
-import com.gic.finance.constant.OrderTypeEnum;
-import com.gic.marketing.process.api.service.sms.SmsSendApiService;
-import com.gic.open.api.dto.market.MarketUserDTO;
-import com.gic.open.api.service.market.MarketAppCategoryApiService;
-import com.gic.open.api.service.market.MarketUserApiService;
-import com.gic.operation.web.vo.ApplicationTokenVO;
-import com.gic.operation.web.vo.CouponLogVO;
-import com.gic.operation.web.vo.MarketAppCategoryVO;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
@@ -35,9 +18,12 @@ import org.springframework.web.bind.annotation.RestController;
 import com.alibaba.fastjson.JSON;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
+import com.gic.auth.constant.UserConstants;
 import com.gic.auth.dto.UserDTO;
 import com.gic.auth.service.MenuApiService;
 import com.gic.auth.service.UserApiService;
+import com.gic.authcenter.security.core.dto.EnterpriseTempDTO;
+import com.gic.authcenter.security.core.dto.UserDetailsVO;
 import com.gic.authcenter.security.core.util.UserUtils;
 import com.gic.commons.util.CollectionUtil;
 import com.gic.commons.util.EntityUtil;
@@ -48,27 +34,39 @@ import com.gic.enterprise.constant.EnterpriseVersionStatusEnum;
 import com.gic.enterprise.dto.EnterpriseDTO;
 import com.gic.enterprise.dto.EnterpriseInitDTO;
 import com.gic.enterprise.dto.EnterpriseLicenseDTO;
+import com.gic.enterprise.dto.EnterpriseResourceRelDTO;
 import com.gic.enterprise.dto.market.OrderBuyLicenseDTO;
 import com.gic.enterprise.dto.market.OrderGicDTO;
+import com.gic.enterprise.error.ErrorCode;
 import com.gic.enterprise.qo.BuyForGicQO;
+import com.gic.enterprise.qo.EnterpriseQO;
 import com.gic.enterprise.qo.OrderServiceQO;
 import com.gic.enterprise.response.EnterpriseRestResponse;
 import com.gic.enterprise.service.EnterpriseApiService;
 import com.gic.enterprise.service.EnterpriseInitApiService;
+import com.gic.enterprise.utils.AutoCreatePasswordUtils;
 import com.gic.enterprise.utils.ResultControllerUtils;
+import com.gic.finance.constant.EnterprisePlatformTypeEnum;
+import com.gic.finance.constant.OrderTypeEnum;
 import com.gic.finance.dto.TransferAccountsApprovalDTO;
 import com.gic.finance.service.TransferAccountsApprovalApiService;
+import com.gic.marketing.process.api.service.sms.SmsSendApiService;
 import com.gic.open.api.dto.ApplicationTokenDTO;
 import com.gic.open.api.dto.OrderDTO;
 import com.gic.open.api.dto.OrderItemDTO;
+import com.gic.open.api.dto.market.MarketUserDTO;
 import com.gic.open.api.service.AppTokenApiService;
 import com.gic.open.api.service.CouponApiService;
 import com.gic.open.api.service.OrderApiService;
 import com.gic.open.api.service.ServeApiService;
+import com.gic.open.api.service.market.MarketAppCategoryApiService;
+import com.gic.open.api.service.market.MarketUserApiService;
 import com.gic.operation.web.qo.PageQO;
 import com.gic.operation.web.utils.UserPasswordUtil;
+import com.gic.operation.web.vo.ApplicationTokenVO;
+import com.gic.operation.web.vo.CouponLogVO;
+import com.gic.operation.web.vo.MarketAppCategoryVO;
 import com.gic.operation.web.vo.enterprise.*;
-import com.gic.store.utils.CommonResultControllerUtils;
 
 /**
  * 商户相关操作
@@ -166,8 +164,6 @@ public class EnterpriseController {
                 .setServiceStatus(serviceStatus);
         pageQO.setCurrentPage(pageQO.getCurrentPage());
         pageQO.setPageSize(pageQO.getPageSize());
-        //todo 现放开过滤
-        params.setListAll(1);
         return ResultControllerUtils.commonResult(enterpriseApiService.listEnterprise(params));
     }
 
@@ -224,8 +220,7 @@ public class EnterpriseController {
 
     @RequestMapping("/list-enterprise-init-info")
     public RestResponse listEnterpriseInitInfo(Integer enterpriseId) {
-        List<EnterpriseInitDTO> dtoList = (List<EnterpriseInitDTO>) CommonResultControllerUtils
-                .commonResult(enterpriseInitApiService.listByEnterpriseId(enterpriseId));
+        List<EnterpriseInitDTO> dtoList = enterpriseInitApiService.listByEnterpriseId(enterpriseId).getResult();
         return RestResponse.success(changeListToTree(0, dtoList));
     }
 
@@ -290,20 +285,17 @@ public class EnterpriseController {
 
     @RequestMapping("/get-enterprise")
     public RestResponse editEnterprise(Integer enterpriseId) {
-        return RestResponse.success(
-                CommonResultControllerUtils.commonResult(enterpriseApiService.getEnterpriseById(enterpriseId)));
+        return ResultControllerUtils.commonResult(enterpriseApiService.getEnterpriseById(enterpriseId)));
     }
 
     @RequestMapping("/enable-enterprise")
     public RestResponse enableEnterprise(Integer enterpriseId) {
-        return RestResponse
-                .success(CommonResultControllerUtils.commonResult(enterpriseApiService.enableEnterprise(enterpriseId)));
+        return ResultControllerUtils.commonResult(enterpriseApiService.enableEnterprise(enterpriseId)));
     }
 
     @RequestMapping("/disable-enterprise")
     public RestResponse disableEnterprise(Integer enterpriseId) {
-        return RestResponse.success(
-                CommonResultControllerUtils.commonResult(enterpriseApiService.disableEnterprise(enterpriseId)));
+        return ResultControllerUtils.commonResult(enterpriseApiService.disableEnterprise(enterpriseId)));
     }
 
     @RequestMapping("/basic-service-info")
@@ -318,8 +310,7 @@ public class EnterpriseController {
 
     @RequestMapping("/list-gic-default-service")
     public RestResponse listGicDefaultService() {
-        return RestResponse
-                .success(CommonResultControllerUtils.commonResult(serveApiService.listServePropByGICDefaultAPP()));
+        return ResultControllerUtils.commonResult(serveApiService.listServePropByGICDefaultAPP()));
     }
 
     @RequestMapping("/enterprise-detail")