diff --git a/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/constant/SqlConstants.java b/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/constant/SqlConstants.java index 2ce31118..be8a5dad 100644 --- a/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/constant/SqlConstants.java +++ b/kicc-platform/kicc-platform-api/kicc-workflow-api/src/main/java/com/cloud/kicc/workflow/api/constant/SqlConstants.java @@ -12,10 +12,10 @@ public interface SqlConstants { String QUERY_ACT_HI_COMMENT= "select * from ACT_HI_COMMENT where TYPE_ like ? and TASK_ID_ = ? order by TIME_ desc"; - String QUERY_USER_BY_ID = "select csu.id, csu.user_name userName, csu.nick_name nickName, csu.password, u.dept_id deptId, u.status from sys_user u join remote_cas_sso_user csu on u.cas_user_id = csu.id where csu.id = ?"; + String QUERY_USER_BY_ID = "select csu.id, csu.user_name userName, csu.nick_name nickName, csu.password, u.dept_id deptId, u.status from sys_user u join cas_sso_user_view csu on u.cas_user_id = csu.id where csu.id = ?"; - String QUERY_USER_BY_DEPT_ID = "select csu.id, csu.user_name userName, csu.nick_name nickName, csu.password, u.dept_id deptId, u.status from sys_user u join remote_cas_sso_user csu on u.cas_user_id = csu.id where u.dept_id = ?"; + String QUERY_USER_BY_DEPT_ID = "select csu.id, csu.user_name userName, csu.nick_name nickName, csu.password, u.dept_id deptId, u.status from sys_user u join cas_sso_user_view csu on u.cas_user_id = csu.id where u.dept_id = ?"; - String QUERY_USER_BY_ROLE_ID = "select distinct csu.id, csu.user_name userName, csu.nick_name nickName, csu.password, u.dept_id deptId, u.status from sys_user u join remote_cas_sso_user csu on u.cas_user_id = csu.id join sys_user_role b on csu.id = b.user_id where b.role_id = ?"; + String QUERY_USER_BY_ROLE_ID = "select distinct csu.id, csu.user_name userName, csu.nick_name nickName, csu.password, u.dept_id deptId, u.status from sys_user u join cas_sso_user_view csu on u.cas_user_id = csu.id join sys_user_role b on csu.id = b.user_id where b.role_id = ?"; } diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushBlacklistMapper.xml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushBlacklistMapper.xml index 391d81e2..de94faad 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushBlacklistMapper.xml +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushBlacklistMapper.xml @@ -31,7 +31,7 @@ from common_push_blacklist bl join sys_user u on bl.fan_user_id = u.cas_user_id - join remote_cas_sso_user csu on u.cas_user_id = csu.id + join cas_sso_user_view csu on u.cas_user_id = csu.id bl.del_flag = 0 AND u.del_flag = 0 AND u.status = 0 AND bl.concern_user_id = #{map.createById} @@ -70,7 +70,7 @@ from common_push_blacklist bl join sys_user u on bl.fan_user_id = u.cas_user_id - join remote_cas_sso_user csu on u.cas_user_id = csu.id + join cas_sso_user_view csu on u.cas_user_id = csu.id bl.del_flag = 0 AND u.del_flag = 0 AND u.status = 0 AND bl.concern_user_id = #{concernUserId} AND diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushConcernFanMapper.xml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushConcernFanMapper.xml index 61c784e0..8e31bc2c 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushConcernFanMapper.xml +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushConcernFanMapper.xml @@ -40,7 +40,7 @@ cf.fan_user_id = u.cas_user_id - JOIN (SELECT * FROM remote_cas_sso_user WHERE del_flag = 0) csu ON u.cas_user_id = csu.id + JOIN (SELECT * FROM cas_sso_user_view WHERE del_flag = 0) csu ON u.cas_user_id = csu.id cf.del_flag = 0 AND u.status = 0 @@ -98,7 +98,7 @@ cf.fan_user_id = u.cas_user_id - JOIN (SELECT * FROM remote_cas_sso_user WHERE del_flag = 0) csu ON u.cas_user_id = csu.id + JOIN (SELECT * FROM cas_sso_user_view WHERE del_flag = 0) csu ON u.cas_user_id = csu.id cf.del_flag = 0 AND u.status = 0 @@ -156,7 +156,7 @@ ON u.cas_user_id = b.fan_user_id - JOIN (SELECT * FROM remote_cas_sso_user WHERE del_flag = 0) csu ON u.cas_user_id = csu.id + JOIN (SELECT * FROM cas_sso_user_view WHERE del_flag = 0) csu ON u.cas_user_id = csu.id u.del_flag = 0 AND u.status = 0 diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/SsoUserMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/SsoUserMapper.xml index 5b400b83..051dd75b 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/SsoUserMapper.xml +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/SsoUserMapper.xml @@ -4,8 +4,8 @@ diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/UserMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/UserMapper.xml index 5f4c1659..e0d61c3a 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/UserMapper.xml +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/UserMapper.xml @@ -3,200 +3,76 @@