diff --git a/src/main/java/com/jsl/oa/controllers/ProjectController.java b/src/main/java/com/jsl/oa/controllers/ProjectController.java index 17a1652..e1b2f3a 100755 --- a/src/main/java/com/jsl/oa/controllers/ProjectController.java +++ b/src/main/java/com/jsl/oa/controllers/ProjectController.java @@ -42,11 +42,9 @@ public class ProjectController { * @return */ @GetMapping("/project/get/custom") - public BaseResponse projectGetCustom(@RequestParam(required = false) Integer id, - @RequestParam(required = false) List tags, - @RequestParam(required = false) Integer isFinish){ + public BaseResponse projectGetCustom(@RequestParam(required = false) Integer id){ log.info("请求接口[GET]: /project/all/get"); - return projectService.tget(id,tags,isFinish); + return projectService.tget(id); } diff --git a/src/main/java/com/jsl/oa/dao/RoleDAO.java b/src/main/java/com/jsl/oa/dao/RoleDAO.java index a390482..2b0e97a 100644 --- a/src/main/java/com/jsl/oa/dao/RoleDAO.java +++ b/src/main/java/com/jsl/oa/dao/RoleDAO.java @@ -77,6 +77,14 @@ public class RoleDAO { } + public RoleDO getRoleNameByUid(Long uid){ + log.info("\t> 执行 DAO 层 RoleDAO.getRoleNameByUid 方法"); + log.info("\t\t> 从 MySQL 获取数据"); + RoleDO roleDO = roleMapper.getRoleById(getRoleUserByUid(uid).getRid()); + return roleDO; + } + + public boolean roleEdit(RoleDO getRole) { log.info("\t> 执行 DAO 层 RoleDAO.roleEdit 方法"); log.info("\t\t> 从 MySQL 获取数据"); diff --git a/src/main/java/com/jsl/oa/mapper/ProjectMapper.java b/src/main/java/com/jsl/oa/mapper/ProjectMapper.java index 96aecbb..7615dcc 100644 --- a/src/main/java/com/jsl/oa/mapper/ProjectMapper.java +++ b/src/main/java/com/jsl/oa/mapper/ProjectMapper.java @@ -97,10 +97,4 @@ public interface ProjectMapper { //@Select("select * from organize_oa.oa_project where is_delete=false and status=1") List tget(Integer id); - - @Select("select * from organize_oa.oa_project where is_finish=#{isFinish} and is_delete=false") - List tgetByIsfinish(Integer isFinish); - - - List tgetByTags(List tags); } diff --git a/src/main/java/com/jsl/oa/model/doData/ProjectWorkDO.java b/src/main/java/com/jsl/oa/model/doData/ProjectWorkDO.java index 4253f19..6dcd3fa 100644 --- a/src/main/java/com/jsl/oa/model/doData/ProjectWorkDO.java +++ b/src/main/java/com/jsl/oa/model/doData/ProjectWorkDO.java @@ -1,3 +1,4 @@ + package com.jsl.oa.model.doData; import com.fasterxml.jackson.annotation.JsonInclude; @@ -24,4 +25,4 @@ public class ProjectWorkDO { private boolean status; private Timestamp beginTime; private Timestamp completeTime; -} +} \ No newline at end of file diff --git a/src/main/java/com/jsl/oa/model/voData/ProjectWorkVO.java b/src/main/java/com/jsl/oa/model/voData/ProjectWorkVO.java index 15603cf..18eac73 100644 --- a/src/main/java/com/jsl/oa/model/voData/ProjectWorkVO.java +++ b/src/main/java/com/jsl/oa/model/voData/ProjectWorkVO.java @@ -28,3 +28,4 @@ public class ProjectWorkVO { private Timestamp beginTime; private Timestamp completeTime; } + diff --git a/src/main/java/com/jsl/oa/model/voData/UserProfileVo.java b/src/main/java/com/jsl/oa/model/voData/UserProfileVo.java index 213e68b..c94fc1f 100644 --- a/src/main/java/com/jsl/oa/model/voData/UserProfileVo.java +++ b/src/main/java/com/jsl/oa/model/voData/UserProfileVo.java @@ -17,6 +17,7 @@ public class UserProfileVo { private String nickname; private String sex; private String description; + private String role; } diff --git a/src/main/java/com/jsl/oa/services/ProjectService.java b/src/main/java/com/jsl/oa/services/ProjectService.java index 5d02de5..0e3fc17 100644 --- a/src/main/java/com/jsl/oa/services/ProjectService.java +++ b/src/main/java/com/jsl/oa/services/ProjectService.java @@ -40,5 +40,5 @@ public interface ProjectService { BaseResponse projecWorktAdd(HttpServletRequest request, ProjectWorkVO projectWorkVO); - BaseResponse tget(Integer id, List tags, Integer isFinish); + BaseResponse tget(Integer id); } 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 f54d986..636003c 100644 --- a/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java @@ -61,21 +61,9 @@ public class ProjectServiceImpl implements ProjectService { } @Override - public BaseResponse tget(Integer id, List tags, Integer isFinish) { + public BaseResponse tget(Integer id) { log.info("\t> 执行 Service 层 ProjectService.tget 方法"); - - //根据状态查询 - if(isFinish != null){ - List projectDOList = projectDAO.tget(id,tags,isFinish); - return ResultUtil.success(projectDOList); - } - //根据标签查询 - if(tags != null && !tags.isEmpty()){ - List projectDOList = projectDAO.tget(id,tags,isFinish); - return ResultUtil.success(projectDOList); - } - - List projectDOList = projectDAO.tget(id,tags,isFinish); + List projectDOList = projectDAO.tget(id); return ResultUtil.success(projectDOList); } diff --git a/src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java index 9209089..2bd7f96 100755 --- a/src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java @@ -257,16 +257,12 @@ public class UserServiceImpl implements UserService { @Override public BaseResponse userProfileGet(HttpServletRequest request) { log.info("\t> 执行 Service 层 UserService.userProfileGet 方法"); - //判断用户是否为 老师 或 管理员 - if(!Processing.checkUserIsAdmin(request,roleDAO.roleMapper) && - !Processing.checkUserIsTeacher(request,roleDAO.roleMapper)){ - return ResultUtil.error(ErrorCode.NOT_PERMISSION); - } // 获取用户Id UserDO userDO = userDAO.getUserById(Processing.getAuthHeaderToUserId(request)); UserProfileVo userProfileVo = new UserProfileVo(); Processing.copyProperties(userDO, userProfileVo); + userProfileVo.setRole(roleDAO.getRoleNameByUid(userDO.getId()).getDisplayName()); userProfileVo.setSex(Processing.getSex(userDO.getSex())); return ResultUtil.success(userProfileVo); } diff --git a/src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml b/src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml index 7cdbd56..63a556f 100644 --- a/src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml +++ b/src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml @@ -48,21 +48,22 @@ - - - \ No newline at end of file