diff --git a/src/main/java/com/xdap/self_development/controller/CommonParameterController.java b/src/main/java/com/xdap/self_development/controller/CommonParameterController.java index 4862813..c7e888a 100644 --- a/src/main/java/com/xdap/self_development/controller/CommonParameterController.java +++ b/src/main/java/com/xdap/self_development/controller/CommonParameterController.java @@ -28,10 +28,8 @@ public class CommonParameterController { // 查询机型参数常用 @GetMapping("/getModelCommon") - public Response getModelCommonParameter( - @NotBlank @RequestParam String userId - ) { - List list = commonParameterService.getModelCommonParameter(userId); + public Response getModelCommonParameter() { + List list = commonParameterService.getModelCommonParameter(); return Response.ok().data(list); } // 新增机型参数常用 diff --git a/src/main/java/com/xdap/self_development/service/CommonParameterService.java b/src/main/java/com/xdap/self_development/service/CommonParameterService.java index 325bd27..481563c 100644 --- a/src/main/java/com/xdap/self_development/service/CommonParameterService.java +++ b/src/main/java/com/xdap/self_development/service/CommonParameterService.java @@ -10,7 +10,7 @@ import java.util.List; public interface CommonParameterService { List getSystemAndPara(); - List getModelCommonParameter(@NotBlank String userId); + List getModelCommonParameter(); void insertModelCommonParameter(@Valid ModelCommonParameterInsertForm form); diff --git a/src/main/java/com/xdap/self_development/service/impl/BenchmarkingReportServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/BenchmarkingReportServiceImpl.java index c008f1a..c002c94 100644 --- a/src/main/java/com/xdap/self_development/service/impl/BenchmarkingReportServiceImpl.java +++ b/src/main/java/com/xdap/self_development/service/impl/BenchmarkingReportServiceImpl.java @@ -141,7 +141,7 @@ public class BenchmarkingReportServiceImpl implements BenchmarkingReportService String uploadId = new ObjectId().toHexString(); FileUploadDTO fileUploadDTO = apaasMyTokenFeign.uploadFile( - "Bearer " + userToken.getAccess_token(), + userToken.getAccess_token(), "application/x-www-form-urlencoded", file, uploadId, diff --git a/src/main/java/com/xdap/self_development/service/impl/CommonParameterServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/CommonParameterServiceImpl.java index 8235e9c..af768a5 100644 --- a/src/main/java/com/xdap/self_development/service/impl/CommonParameterServiceImpl.java +++ b/src/main/java/com/xdap/self_development/service/impl/CommonParameterServiceImpl.java @@ -1,5 +1,6 @@ package com.xdap.self_development.service.impl; +import com.xdap.self_development.common.UserPermissionGetter; import com.xdap.self_development.config.BusinessDatabase; import com.xdap.self_development.controller.form.*; import com.xdap.self_development.exception.CommonException; @@ -21,6 +22,8 @@ import java.util.stream.Collectors; public class CommonParameterServiceImpl implements CommonParameterService { @Resource private BusinessDatabase bd; + @Resource + private UserPermissionGetter permissionGetter; @Override public List getSystemAndPara() { @@ -33,9 +36,9 @@ public class CommonParameterServiceImpl implements CommonParameterService { } @Override - public List getModelCommonParameter(String userId) { + public List getModelCommonParameter() { List commonParameters = bd.getBusinessDatabase() - .eq("create_by", userId) + .eq("create_by", permissionGetter.getCurrentUserId()) .eq("common_type", 1) .doQuery(CommonParameter.class); diff --git a/src/main/java/com/xdap/self_development/service/impl/ResponsiblePersonServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/ResponsiblePersonServiceImpl.java index 94e5257..242c9c0 100644 --- a/src/main/java/com/xdap/self_development/service/impl/ResponsiblePersonServiceImpl.java +++ b/src/main/java/com/xdap/self_development/service/impl/ResponsiblePersonServiceImpl.java @@ -28,12 +28,13 @@ public class ResponsiblePersonServiceImpl implements ResponsiblePersonService { @Override public void saveResponsiblePerson(ResponsiblePersonForm form) { List responsiblePeople = bd.getBusinessDatabase() - .eq("userId", form.getUserId()) + .eq("department_id", form.getDepartmentId()) + .eq("subsystem", form.getSubsystem()) .eq("personLevel", 1) .doQuery(ResponsiblePerson.class); if (!responsiblePeople.isEmpty()) { - throw new CommonException("请不要重复新增责任人"); + throw new CommonException("一个部门和子系统只能有一个责任人"); } ResponsiblePerson responsiblePerson = new ResponsiblePerson();