diff --git a/src/main/resources/mybatis/datasource/bus/HiddenMapper.xml b/src/main/resources/mybatis/datasource/bus/HiddenMapper.xml index 816c8706..dc50c415 100644 --- a/src/main/resources/mybatis/datasource/bus/HiddenMapper.xml +++ b/src/main/resources/mybatis/datasource/bus/HiddenMapper.xml @@ -875,11 +875,11 @@ (select group_concat(chr.NAME) from BUS_HIDDENCHECK bh left join sys_user chr on chr.USER_ID=bh.USER_ID where bh.HIDDEN_ID=f.HIDDEN_ID ) CHECKNAME from f - left join sys_user cr on cr.USER_ID = f.CREATOR - left join sys_user re on re.USER_ID = f.RECTIFICATIONOR - left join sys_user ch on ch.USER_ID = f.CHECKOR - left join sys_user rev on rev.USER_ID = f.REVIEWOR - left join sys_user conUser on conUser.USER_ID = f.CONFIRM_USER + left join qa-gwj-prevention.`vi_user_all` cr on cr.USER_ID = f.CREATOR + left join qa-gwj-prevention.`vi_user_all` re on re.USER_ID = f.RECTIFICATIONOR + left join qa-gwj-prevention.`vi_user_all` ch on ch.USER_ID = f.CHECKOR + left join qa-gwj-prevention.`vi_user_all` rev on rev.USER_ID = f.REVIEWOR + left join qa-gwj-prevention.`vi_user_all` conUser on conUser.USER_ID = f.CONFIRM_USER left join oa_department crd on crd.DEPARTMENT_ID = f.HIDDENFINDDEPT left join oa_department red on red.DEPARTMENT_ID = f.RECTIFICATIONDEPT left join oa_department chd on chd.DEPARTMENT_ID = f.CHECKDEPT diff --git a/src/main/resources/mybatis/datasource/hiddenApi/HiddenApiMapper.xml b/src/main/resources/mybatis/datasource/hiddenApi/HiddenApiMapper.xml index 242ee571..6af6dad9 100644 --- a/src/main/resources/mybatis/datasource/hiddenApi/HiddenApiMapper.xml +++ b/src/main/resources/mybatis/datasource/hiddenApi/HiddenApiMapper.xml @@ -508,16 +508,18 @@ f.* FROM bus_hidden f - LEFT JOIN sys_user confirmUser on confirmUser.USER_ID = f.CONFIRM_USER left join bus_hidden_user bhu on bhu.HIDDEN_ID = f.HIDDEN_ID - left join sys_user bhuUser on bhuUser.user_id = bhu.user_id - left join oa_department bhuUserDept on bhuUser.DEPARTMENT_ID = bhuUserDept.DEPARTMENT_ID + + left join `qa-gwj-prevention`.vi_user_all zgUser on zgUser.user_id = f.RECTIFICATIONOR + LEFT JOIN `qa-gwj-prevention`.vi_user_all confirmUser on confirmUser.USER_ID = f.CONFIRM_USER + left join `qa-gwj-prevention`.vi_user_all bhuUser on bhuUser.user_id = bhu.user_id + left join `qa-gwj-prevention`.vi_department_all bhuUserDept on bhuUser.DEPARTMENT_ID = bhuUserDept.DEPARTMENT_ID + LEFT JOIN bus_hiddencheck hch on hch.HIDDEN_ID = f.HIDDEN_ID left join sys_dictionaries type1 on type1.bianma = f.HIDDENTYPE left join oa_department zgUserDept on zgUserDept.DEPARTMENT_ID = f.RECTIFICATIONDEPT left join bus_hiddenregion hreg on hreg.HIDDENREGION_ID = f.HIDDENPART - left join sys_user zgUser on zgUser.user_id = f.RECTIFICATIONOR WHERE f.ISDELETE = '0' and f.STATE not in ('0','7','8','100','101','102')