diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Post.java b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Post.java index 58e84130..a750fc6b 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Post.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Post.java @@ -35,6 +35,7 @@ public class Post extends DataEntity { private Integer postSort; // 岗位排序(升序) private String empCode; // 根据用户查询岗位 + private String userCode; // 根据用户编码查询 private String roleCodes; // 关联的角色编号 private String roleNames; // 关联的角色名称 @@ -110,6 +111,16 @@ public class Post extends DataEntity { this.empCode = empCode; } + @ApiModelProperty("根据用户编码查询") + public String getUserCode() { + return userCode; + } + + public void setUserCode(String userCode) { + this.userCode = userCode; + } + + @ApiModelProperty("岗位绑定角色编码") public String getRoleCodes() { return roleCodes; } diff --git a/modules/core/src/main/resources/mappings/modules/sys/PostDao.xml b/modules/core/src/main/resources/mappings/modules/sys/PostDao.xml index e5ee369e..2f9d3e7d 100644 --- a/modules/core/src/main/resources/mappings/modules/sys/PostDao.xml +++ b/modules/core/src/main/resources/mappings/modules/sys/PostDao.xml @@ -7,13 +7,20 @@ SELECT ${sqlMap.column.toSql()} FROM ${sqlMap.table.toSql()} - JOIN ${_prefix}sys_employee_post b on a.post_code = b.post_code + JOIN ${_prefix}sys_employee_post b ON b.post_code = a.post_code + + + JOIN ${_prefix}sys_employee_post b2 on b2.post_code = a.post_code + JOIN ${_prefix}sys_user u on u.ref_code = b2.emp_code AND u.user_type = 'employee' ${sqlMap.where.toSql()} AND b.emp_code = #{empCode} + + AND u.user_code = #{userCode} + ORDER BY ${sqlMap.order.toSql()}