代码备份

src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java

@@ -121,8 +121,8 @@ public class SupManufacturerController {
     @AuthRuleAnnotation("")
     @GetMapping("/directToCpt/sup/manufacturer/getCompanyBySup")
     public BaseResponse getCompanyBySup(FilterSupManufacturerRequest filterSupManufacturerRequest) {
-        filterSupManufacturerRequest.setCustomerId(getCompanyId());
-        System.out.println("111111111111111111111111111111111111:"+getCompanyId());
+        filterSupManufacturerRequest.setCustomerId(getCustomerId());
+        System.out.println("111111111111111111111111111111111111:"+getCustomerId());
         List<SupManufacturerEntity> companyEntities = supManufacturerService.getCompany(filterSupManufacturerRequest);
         PageInfo<SupManufacturerEntity> pageInfo = new PageInfo<>(companyEntities);
         PageSimpleResponse<SupManufacturerEntity> pageSimpleResponse = new PageSimpleResponse<>();
@@ -643,18 +643,18 @@ public class SupManufacturerController {
 
     }
 
-    public String getCustomerId() {
-        ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
-        if (attributes == null) {
-            throw new JsonException(ResultEnum.NOT_NETWORK);
-        }
-        HttpServletRequest request = attributes.getRequest();
-        String userId = request.getHeader("ADMIN_ID");
-        AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId));
-        return authAdmin.getCustomerId() + "";
-    }
+//    public String getCustomerId() {
+//        ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+//        if (attributes == null) {
+//            throw new JsonException(ResultEnum.NOT_NETWORK);
+//        }
+//        HttpServletRequest request = attributes.getRequest();
+//        String userId = request.getHeader("ADMIN_ID");
+//        AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId));
+//        return authAdmin.getCustomerId() + "";
+//    }
 
-    public String getCompanyId() {
+    public String getCustomerId() {
         ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
         if (attributes == null) {
             throw new JsonException(ResultEnum.NOT_NETWORK);
@@ -663,4 +663,14 @@ public class SupManufacturerController {
         String companyId = request.getHeader("companyId");
         return companyId;
     }
+
+//    public String getCompanyId() {
+//        ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+//        if (attributes == null) {
+//            throw new JsonException(ResultEnum.NOT_NETWORK);
+//        }
+//        HttpServletRequest request = attributes.getRequest();
+//        String companyId = request.getHeader("companyId");
+//        return companyId;
+//    }
 }