From 8fc5375db933f9c0ceb12b521e755c8c08adfabc Mon Sep 17 00:00:00 2001 From: dearlin <1261008090@qq.com> Date: Wed, 8 Nov 2023 14:37:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E8=88=AC=E9=9A=90=E6=82=A3=E5=8F=B0?= =?UTF-8?q?=E8=B4=A6=E5=AF=BC=E5=87=BA=EF=BC=8C=E7=9B=91=E7=AE=A1=E7=AB=AF?= =?UTF-8?q?=E7=9A=84=E5=88=9B=E5=BB=BA=E4=BA=BA=E5=92=8C=E5=8F=91=E7=8E=B0?= =?UTF-8?q?=E4=BA=BA=20=E6=B2=A1=E6=9C=89=E6=98=BE=E7=A4=BA=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=20=E6=B3=A8=E6=84=8F=E6=8C=89=E5=88=97=E5=AF=BC?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mybatis/datasource/bus/HiddenMapper.xml | 10 +++++----- .../mybatis/datasource/hiddenApi/HiddenApiMapper.xml | 10 ++++++---- 2 files changed, 11 insertions(+), 9 deletions(-) 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')