diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/controller/SysUserController.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/controller/SysUserController.java index d9519bd..8b475b8 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/controller/SysUserController.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/controller/SysUserController.java @@ -100,6 +100,12 @@ public class SysUserController extends BaseController { } } } + + if(com.bonus.common.core.utils.StringUtils.isNotNull(bean.getPostId())){ + Long postIds = Long.valueOf(bean.getPostId()); + String postId = userMapper.selectPostIdByIds(postIds); + bean.setPostId(postId); + } startPage(); List list = userService.selectUserList(bean); return getDataTable(list); diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/dao/SysUserMapper.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/dao/SysUserMapper.java index b1af671..051ee3a 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/dao/SysUserMapper.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/dao/SysUserMapper.java @@ -164,6 +164,13 @@ public interface SysUserMapper */ String selectPostIdById(Long postId); + /** + * 根据岗位ID获取岗位ID + * @param postId + * @return + */ + String selectPostIdByIds(Long postId); + /** * 获取组织列表 * @param diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/basic/SysUserMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/basic/SysUserMapper.xml index c48e2e7..3b96bd8 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/basic/SysUserMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/basic/SysUserMapper.xml @@ -58,7 +58,9 @@ - UPDATE att_group_person_relation SET is_active = '0' WHERE user_id = #{userId} + UPDATE att_group_person_relation + SET is_active = '0' + WHERE user_id = #{userId} update sys_user @@ -103,7 +105,9 @@ and org_id = #{oldOrgId}; - UPDATE leave_apply SET org_id = #{orgId},org_name = #{orgName} + UPDATE leave_apply + SET org_id = #{orgId}, + org_name = #{orgName} WHERE user_id = #{userId} @@ -171,6 +175,9 @@ AND suo.org_id = #{params.orgId} + + and sup.post_id = #{params.postId} + AND su.phone = #{params.phone} @@ -184,9 +191,9 @@ ) - - - + + + and agpr.user_id is not null @@ -243,6 +250,15 @@ and dict_type = 'post_list' and status = '0' limit 1 + + + SELECT GROUP_CONCAT(suo.org_id SEPARATOR ', ') AS orgName FROM `sys_user` su - LEFT JOIN sys_user_org suo on suo.user_id = su.user_id and suo.is_active = 1 + LEFT JOIN sys_user_org suo on suo.user_id = su.user_id and suo.is_active = 1 WHERE su.is_active = 1 AND su.user_id = #{userId} @@ -352,11 +368,10 @@ SELECT * FROM sys_organization_head WHERE is_active = '1' - AND org_id in ( - SELECT org_id FROM sys_organization_head - WHERE is_active = '1' - AND user_id = #{userId} - ) + AND org_id in (SELECT org_id + FROM sys_organization_head + WHERE is_active = '1' + AND user_id = #{userId})