diff --git a/src/main/resources/mybatis/datasource/eightwork/EightWorkTaskMapper.xml b/src/main/resources/mybatis/datasource/eightwork/EightWorkTaskMapper.xml index 3f3ce9f..5d6d9a8 100644 --- a/src/main/resources/mybatis/datasource/eightwork/EightWorkTaskMapper.xml +++ b/src/main/resources/mybatis/datasource/eightwork/EightWorkTaskMapper.xml @@ -43,8 +43,8 @@ diff --git a/src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml b/src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml index 5f6f782..24c148a 100644 --- a/src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml +++ b/src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml @@ -476,9 +476,7 @@ and sign.SIGN_TIME is null and sign.SIGN_USER_ID = #{pd.USER_ID} and step.STEP_NAME = #{pd.STEP_NAME} - - and f.STEP_ID != -1 - + and f.STEP_ID != -1 ) @@ -514,10 +512,10 @@ from bus_hotwork_sign sign left join bus_eightwork_step step on step.STEP_ID = sign.STEP_ID - left join bus_hotwork a on a.HOTWORK_ID = sign.HOTWORK_ID + left join bus_hotwork work on work.HOTWORK_ID = sign.HOTWORK_ID where sign.SIGN_TIME is null - and a.STEP_ID != '-1' + and work.STEP_ID != '-1' and sign.SIGN_USER_ID = #{USER_ID} group by step.CODE