Merge remote-tracking branch 'origin/master'

src/main/java/com/jsl/oa/controllers/ProjectController.java

@@ -35,7 +35,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);
     }

src/main/java/com/jsl/oa/dao/ProjectDAO.java

@@ -7,6 +7,8 @@ import com.jsl.oa.model.doData.ProjectDO;
 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;
@@ -92,6 +94,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);
+
     }
 }

src/main/java/com/jsl/oa/mapper/ProjectMapper.java

@@ -45,5 +45,5 @@ public interface ProjectMapper {
     List<ProjectDO> get();
 
     @Select("select * from organize_oa.oa_project where name=#{name}")
-    BaseResponse getByName(String name);
+    ProjectDO getByName(String name);
 }

src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java

@@ -168,6 +168,7 @@ public class ProjectServiceImpl implements ProjectService {
 
     @Override
     public BaseResponse getByName(String name) {
+
         return projectDAO.getByName(name);
     }