代码备份

cert
schry 2 years ago
parent ceee3e35d2
commit 2dae4b52f4

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

Loading…
Cancel
Save