Browse Source

部门修改

anderx 2 years ago
parent
commit
daf711bf65

+ 3 - 4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ProjectTaskController.java

@@ -25,6 +25,7 @@ import com.ruoyi.project.service.ProjectTaskService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -84,10 +85,8 @@ public class ProjectTaskController extends BaseController {
      */
     @PostMapping("/addStaff")
     @ApiOperation("新增项目成员")
-    public AjaxResult addStaff( @RequestBody ProjectStaff in){
-        if (in.getAid()== null){
-            return error("项目成员不能为空");
-        }
+    public AjaxResult addStaff(@Validated @RequestBody ProjectStaff in){
+
         return projectStaffService.addStaff(in);
     }
 

+ 3 - 0
ruoyi-system/src/main/java/com/ruoyi/project/domain/ProjectStaff.java

@@ -2,6 +2,7 @@ package com.ruoyi.project.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -51,6 +52,7 @@ public class ProjectStaff implements Serializable {
         this.id = id;
     }
 
+
     public Long getPid() {
         return pid;
     }
@@ -59,6 +61,7 @@ public class ProjectStaff implements Serializable {
         this.pid = pid;
     }
 
+    @NotBlank(message = "成员编号不能为空")
     public Long getAid() {
         return aid;
     }

+ 1 - 0
ruoyi-system/src/main/java/com/ruoyi/project/mapper/ProjectStaffMapper.java

@@ -21,4 +21,5 @@ public interface ProjectStaffMapper {
     void deleteBypid(Long id);
 
     List<ProjectStaff> selectByPid(Long id);
+
 }

+ 1 - 0
ruoyi-system/src/main/java/com/ruoyi/project/service/impl/ProjectStaffServiceImpl.java

@@ -31,6 +31,7 @@ public class ProjectStaffServiceImpl implements ProjectStaffService {
 
     @Override
     public AjaxResult addStaff(ProjectStaff in) {
+        projectStaffMapper.deleteBypid(null);
         List<ProjectStaff> projectStaffs = projectStaffMapper.selectByPid(in.getPid());
         for (ProjectStaff projectStaff : projectStaffs) {
             if (projectStaff.getAid().equals(in.getAid())){

+ 1 - 0
ruoyi-system/src/main/resources/mapper/project/ProjectStaffMapper.xml

@@ -103,6 +103,7 @@
     where pid = #{pid}
   </delete>
 
+
   <select id="selectByPid" parameterType="java.lang.Long" resultMap="BaseResultMap">
   select
   <include refid="Base_Column_List" />