Commit 1058b241 authored by 鲍德's avatar 鲍德

用户岗位关系保存

parent ae693bf2
...@@ -76,10 +76,15 @@ public class ProjectUserPostController extends BaseController ...@@ -76,10 +76,15 @@ public class ProjectUserPostController extends BaseController
*/ */
@PreAuthorize("@ss.hasPermi('system:currentProject:add')") @PreAuthorize("@ss.hasPermi('system:currentProject:add')")
@Log(title = "项目用户岗位关系", businessType = BusinessType.INSERT) @Log(title = "项目用户岗位关系", businessType = BusinessType.INSERT)
@PostMapping @PostMapping("save")
public AjaxResult add(@RequestBody ProjectUserPost projectUserPost) public AjaxResult add(@RequestBody ProjectUserPost projectUserPost)
{ {
return toAjax(projectUserPostService.insertProjectUserPost(projectUserPost)); if(projectUserPost.getId() == null){
projectUserPostService.insertProjectUserPost(projectUserPost);
}else{
projectUserPostService.updateProjectUserPost(projectUserPost);
}
return AjaxResult.success();
} }
/** /**
......
...@@ -94,6 +94,15 @@ public class SysUser extends BaseEntity ...@@ -94,6 +94,15 @@ public class SysUser extends BaseEntity
private String postId; private String postId;
private String postName; private String postName;
private String projectUserPostId;
public String getProjectUserPostId() {
return projectUserPostId;
}
public void setProjectUserPostId(String projectUserPostId) {
this.projectUserPostId = projectUserPostId;
}
public SysUser() public SysUser()
{ {
......
...@@ -25,6 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -25,6 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="remark" column="remark" /> <result property="remark" column="remark" />
<result property="postId" column="post_id" /> <result property="postId" column="post_id" />
<result property="postName" column="post_name" /> <result property="postName" column="post_name" />
<result property="projectUserPostId" column="projectUserPostId" />
<association property="dept" column="dept_id" javaType="SysDept" resultMap="deptResult" /> <association property="dept" column="dept_id" javaType="SysDept" resultMap="deptResult" />
<collection property="roles" javaType="java.util.List" resultMap="RoleResult" /> <collection property="roles" javaType="java.util.List" resultMap="RoleResult" />
</resultMap> </resultMap>
...@@ -63,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -63,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
d.dept_name, d.leader d.dept_name, d.leader
<if test="projectId != null and projectId != ''"> <if test="projectId != null and projectId != ''">
, b.post_id,b.post_name , b.post_id,b.post_name,a.id projectUserPostId
</if> </if>
from sys_user u from sys_user u
left join sys_dept d on u.dept_id = d.dept_id left join sys_dept d on u.dept_id = d.dept_id
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment