diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcUserMaterialMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcUserMaterialMapper.xml index 194a2bbe5..7c223f4f7 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcUserMaterialMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcUserMaterialMapper.xml @@ -42,6 +42,7 @@ FROM sys_user su LEFT JOIN sys_dept sd ON su.dept_id = sd.dept_id and sd.del_flag = '0' WHERE su.del_flag = '0' + and su.user_name like concat('%', #{userCode}, '%') and su.nick_name like concat('%', #{userName}, '%') and sd.dept_id = #{deptId} and su.phonenumber like concat('%', #{phonenumber}, '%') @@ -57,6 +58,7 @@ '%') and factory_code = #{factoryCode} + and del_flag = '0' --> @@ -69,7 +71,7 @@ phonenumber, create_time FROM sys_user - WHERE user_name = #{userCode} + WHERE del_flag = '0' and user_name = #{userCode} select qum.user_code, qum.user_name from qc_user_material qum - where qum.material_code = #{materialCode} + where qum.del_flag = '0' and qum.material_code = #{materialCode} insert into qc_user_material @@ -176,11 +178,11 @@ - delete from qc_user_material where user_code = #{userCode} + update qc_user_material set del_flag = '1' where user_code = #{userCode} - delete from qc_user_material where user_code in + update qc_user_material set del_flag = '1' where user_code in #{userCode}