diff --git a/src/main/java/com/jsl/oa/controllers/ProjectController.java b/src/main/java/com/jsl/oa/controllers/ProjectController.java index 59e4fc7..0bfe3df 100755 --- a/src/main/java/com/jsl/oa/controllers/ProjectController.java +++ b/src/main/java/com/jsl/oa/controllers/ProjectController.java @@ -226,6 +226,14 @@ public class ProjectController { return projectService.projecWorktAdd(request, projectWorkVO); } + /** + * 获取负责人id + * @return + */ + @GetMapping("/project/pri") + public BaseResponse projectPrincipalGet(){ + return projectService.projectPrincipalGet(); + } /** * 用户获取所分到的项目模块 diff --git a/src/main/java/com/jsl/oa/mapper/UserMapper.java b/src/main/java/com/jsl/oa/mapper/UserMapper.java index 4de3730..5f82e7f 100755 --- a/src/main/java/com/jsl/oa/mapper/UserMapper.java +++ b/src/main/java/com/jsl/oa/mapper/UserMapper.java @@ -3,6 +3,7 @@ package com.jsl.oa.mapper; import com.jsl.oa.model.doData.RoleDO; import com.jsl.oa.model.doData.RoleUserDO; import com.jsl.oa.model.doData.UserDO; +import com.jsl.oa.model.voData.PrincipalSelectVO; import com.jsl.oa.model.voData.UserAllCurrentVO; import com.jsl.oa.model.voData.UserEditProfileVO; import org.apache.ibatis.annotations.Insert; @@ -94,4 +95,8 @@ public interface UserMapper { @Select("SELECT COUNT(*) FROM organize_oa.oa_user") Long getUsersCount(); + + @Select("select oa_user.id,oa_user.username,oa_role.role_name from organize_oa.oa_user join organize_oa.oa_role_user " + + "on oa_user.id = oa_role_user.uid join organize_oa.oa_role on oa_role_user.rid = oa_role.id") + List getPrincipal(); } diff --git a/src/main/java/com/jsl/oa/model/voData/PrincipalSelectVO.java b/src/main/java/com/jsl/oa/model/voData/PrincipalSelectVO.java new file mode 100644 index 0000000..fee0056 --- /dev/null +++ b/src/main/java/com/jsl/oa/model/voData/PrincipalSelectVO.java @@ -0,0 +1,10 @@ +package com.jsl.oa.model.voData; + +import lombok.Data; + +@Data +public class PrincipalSelectVO { + private Integer id; + private String username; + private String roleName; +} diff --git a/src/main/java/com/jsl/oa/services/ProjectService.java b/src/main/java/com/jsl/oa/services/ProjectService.java index dde1515..e906488 100644 --- a/src/main/java/com/jsl/oa/services/ProjectService.java +++ b/src/main/java/com/jsl/oa/services/ProjectService.java @@ -47,4 +47,6 @@ public interface ProjectService { BaseResponse getById(Integer id); BaseResponse getWorkById(Integer id); + + BaseResponse projectPrincipalGet(); } diff --git a/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java index 222b449..104bc7d 100644 --- a/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java @@ -8,6 +8,7 @@ import com.jsl.oa.dao.ProjectDAO; import com.jsl.oa.dao.UserDAO; import com.jsl.oa.mapper.ProjectMapper; import com.jsl.oa.mapper.RoleMapper; +import com.jsl.oa.mapper.UserMapper; import com.jsl.oa.model.doData.ProjectCuttingDO; import com.jsl.oa.model.doData.ProjectDO; import com.jsl.oa.model.doData.ProjectWorkDO; @@ -46,6 +47,7 @@ import java.util.Objects; @RequiredArgsConstructor public class ProjectServiceImpl implements ProjectService { + private final UserMapper userMapper; private final ProjectMapper projectMapper; private final RoleMapper roleMapper; private final ProjectDAO projectDAO; @@ -170,6 +172,11 @@ public class ProjectServiceImpl implements ProjectService { return ResultUtil.success(projectWorkDO); } + @Override + public BaseResponse projectPrincipalGet() { + return ResultUtil.success(userMapper.getPrincipal()); + } + @Override public BaseResponse projectEdit(HttpServletRequest request, @NotNull ProjectEditVO projectEdit, Long projectId) { log.info("\t> 执行 Service 层 ProjectService.projectEdit 方法");