diff --git a/src/main/java/com/jsl/oa/controllers/ProjectController.java b/src/main/java/com/jsl/oa/controllers/ProjectController.java index dcca935..79c9a07 100755 --- a/src/main/java/com/jsl/oa/controllers/ProjectController.java +++ b/src/main/java/com/jsl/oa/controllers/ProjectController.java @@ -37,7 +37,7 @@ public class ProjectController { } @GetMapping("/project/header") - public BaseResponse projectGetByName(@RequestParam(required = false) String name) { + public BaseResponse projectGetByName(@RequestParam String name) { log.info("请求接口[GET]: /project/header"); return projectService.getByName(name); } diff --git a/src/main/java/com/jsl/oa/dao/ProjectDAO.java b/src/main/java/com/jsl/oa/dao/ProjectDAO.java index 69c8bbc..7da847b 100644 --- a/src/main/java/com/jsl/oa/dao/ProjectDAO.java +++ b/src/main/java/com/jsl/oa/dao/ProjectDAO.java @@ -8,6 +8,8 @@ import com.jsl.oa.model.doData.info.CarouselDO; import com.jsl.oa.model.doData.info.ProjectShowDO; import com.jsl.oa.model.voData.ProjectInfoVO; import com.jsl.oa.utils.BaseResponse; +import com.jsl.oa.utils.ErrorCode; +import com.jsl.oa.utils.ResultUtil; import lombok.RequiredArgsConstructor; import org.springframework.dao.DuplicateKeyException; import org.springframework.stereotype.Component; @@ -95,6 +97,9 @@ public class ProjectDAO { } public BaseResponse getByName(String name) { - return projectMapper.getByName(name); + if(projectMapper.getByName(name)!=null){ + return ResultUtil.success(projectMapper.getByName(name)); + }else return ResultUtil.error(ErrorCode.PROJECT_NOT_EXIST); + } } diff --git a/src/main/java/com/jsl/oa/mapper/ProjectMapper.java b/src/main/java/com/jsl/oa/mapper/ProjectMapper.java index 7914a56..62a4d69 100644 --- a/src/main/java/com/jsl/oa/mapper/ProjectMapper.java +++ b/src/main/java/com/jsl/oa/mapper/ProjectMapper.java @@ -45,5 +45,5 @@ public interface ProjectMapper { List get(); @Select("select * from organize_oa.oa_project where name=#{name}") - BaseResponse getByName(String name); + ProjectDO getByName(String name); } 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 dcac7b6..6356f0e 100644 --- a/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java @@ -171,6 +171,7 @@ public class ProjectServiceImpl implements ProjectService { @Override public BaseResponse getByName(String name) { + return projectDAO.getByName(name); }