From aa086ea9cd626df5567ad72fd9b4511b0c77e97d Mon Sep 17 00:00:00 2001 From: ArgonarioD Date: Wed, 13 Jul 2022 16:39:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E6=8B=A5=E6=9C=89?= =?UTF-8?q?=E5=85=A8=E5=B1=80=E6=9C=80=E9=AB=98=E6=9D=83=E9=99=90=E7=9A=84?= =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E8=BF=9B=E5=85=A5=E6=9C=AA=E5=8F=82=E4=B8=8E?= =?UTF-8?q?=E7=9A=84=E9=A1=B9=E7=9B=AE=E6=97=B6=E6=9F=A5=E8=AF=A2=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProjectGroupController.java | 10 +++++++--- .../projectmanagement/service/IStaffService.java | 1 + .../edu/hfut/rmdjzz/projectmanagement/ExcelTests.java | 6 ++++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/controller/ProjectGroupController.java b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/controller/ProjectGroupController.java index d796b2b..bcffdc8 100644 --- a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/controller/ProjectGroupController.java +++ b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/controller/ProjectGroupController.java @@ -6,6 +6,7 @@ import cn.edu.hfut.rmdjzz.projectmanagement.entity.vo.GroupPositionVO; import cn.edu.hfut.rmdjzz.projectmanagement.exception.BadRequestException; import cn.edu.hfut.rmdjzz.projectmanagement.exception.ForbiddenException; import cn.edu.hfut.rmdjzz.projectmanagement.service.IProjectGroupService; +import cn.edu.hfut.rmdjzz.projectmanagement.service.IStaffService; import cn.edu.hfut.rmdjzz.projectmanagement.service.ITaskService; import cn.edu.hfut.rmdjzz.projectmanagement.utils.TokenUtils; import cn.edu.hfut.rmdjzz.projectmanagement.utils.ValidateUtils; @@ -63,11 +64,14 @@ public class ProjectGroupController { if (projectGroupService.getProjectAccessLevel(token, projectId) == 0) { throw new ForbiddenException(IProjectGroupService.UNABLE_TO_ACCESS_PROJECT); } - return ResponseMap.ofSuccess(projectGroupService.getOne( + ProjectGroup designatedStaff = projectGroupService.getOne( Wrappers.lambdaQuery() .eq(ProjectGroup::getStaffId, staffId) - .eq(ProjectGroup::getProjectId, projectId) - )); + .eq(ProjectGroup::getProjectId, projectId)); + if (designatedStaff == null) { //说明是超级管理员 + designatedStaff = new ProjectGroup(staffId, projectId, IStaffService.LEVEL_1, 1); + } + return ResponseMap.ofSuccess(designatedStaff); } @Operation(description = "body中只传staffUsername和projectStaffPosition") diff --git a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/IStaffService.java b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/IStaffService.java index 965eb06..09b4db0 100644 --- a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/IStaffService.java +++ b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/IStaffService.java @@ -16,6 +16,7 @@ import java.util.Map; public interface IStaffService extends IService { String STAFF_DOES_NOT_EXIST = "用户不存在"; + String LEVEL_1 = "超级管理员"; Map login(String requestIpAddress, String username, String password) throws BadRequestException, TokenException, ForbiddenException; diff --git a/src/test/java/cn/edu/hfut/rmdjzz/projectmanagement/ExcelTests.java b/src/test/java/cn/edu/hfut/rmdjzz/projectmanagement/ExcelTests.java index da56d5e..f8e2ebc 100644 --- a/src/test/java/cn/edu/hfut/rmdjzz/projectmanagement/ExcelTests.java +++ b/src/test/java/cn/edu/hfut/rmdjzz/projectmanagement/ExcelTests.java @@ -7,6 +7,7 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.mock.web.MockMultipartFile; +import org.springframework.util.DigestUtils; import org.springframework.web.multipart.MultipartFile; /** @@ -23,7 +24,8 @@ public class ExcelTests { @Test public void importTest() { MultipartFile excelFile = new MockMultipartFile("账户导入模板.xlsx", - FileUtils.class.getClassLoader().getResourceAsStream("static/public/账户导入模板.xlsx")); - staffService.multiImport("", excelFile); + FileUtils.class.getClassLoader().getResourceAsStream("/static/public/账户导入模板.xlsx")); + //staffService.multiImport("", excelFile); + System.out.println(DigestUtils.md5DigestAsHex(excelFile.getBytes())); } }