diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml index 4ef4bf49..2b511920 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml @@ -222,7 +222,7 @@ ) - and sai.company_id = #{companyId} + and mt.company_id = #{companyId} ORDER BY sai.end_time diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml index 079a3e62..3bef3949 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml @@ -1465,7 +1465,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" bm_project bmp LEFT JOIN sys_dept sd ON sd.dept_id = bmp.imp_unit LEFT JOIN bm_agreement_info bai ON bai.project_id = bmp.pro_id - AND bai.`status` = '1' and bai.is_slt = '0' + LEFT JOIN slt_agreement_info sai ON bai.agreement_id = sai.agreement_id + AND bai.`status` = '1' and sai.is_slt = '0' LEFT JOIN bm_unit bu ON bu.unit_id = bai.unit_id AND bu.del_flag = '0' WHERE @@ -1491,7 +1492,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sys_dept sd LEFT JOIN bm_project bmp ON sd.dept_id = bmp.imp_unit LEFT JOIN bm_agreement_info bai ON bai.project_id = bmp.pro_id - AND bai.`status` = '1' and bai.is_slt = '0' + LEFT JOIN slt_agreement_info sai ON bai.agreement_id = sai.agreement_id + AND bai.`status` = '1' and sai.is_slt = '0' LEFT JOIN bm_unit bu ON bu.unit_id = bai.unit_id WHERE bmp.pro_id IS NOT NULL diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lossAssessment/LossAssignMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lossAssessment/LossAssignMapper.xml index f8ccc378..d7dc452d 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lossAssessment/LossAssignMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lossAssessment/LossAssignMapper.xml @@ -457,7 +457,7 @@ user_id as userId, user_name as userName from sys_user - where user_id = #{userId} + where user_id in(1549,57)