diff --git a/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml b/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml index aeb1e0db..e88ca489 100644 --- a/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml @@ -110,8 +110,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join sur_project sp on sp.id = wt.project_id left join sys_dict_data sdd on sdd.dict_type = 'train_nature_zxpx' and wt.train_nature = sdd.dict_value left join sys_dict_data sdd on sdd.dict_type = 'train_nature_yjyl' and wt.train_nature = sdd.dict_value - - and wt.is_del=0 and sp.isDel=0 and sp.progressVisible=0 + where + wt.is_del=0 and sp.isDel=0 and sp.progressVisible=0 and sp.deptId = #{nowDept} and wt.train_type = #{trainType} and wt.project_id = #{projectId} @@ -122,7 +122,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{item} - + group by wt.id order by wt.create_time desc limit 20 @@ -294,7 +294,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join sys_dict_data sdd on sdd.dict_type = 'train_nature_zxpx' and wt.train_nature = sdd.dict_value left join sys_dict_data sdd on sdd.dict_type = 'train_nature_yjyl' and wt.train_nature = sdd.dict_value where - and wt.is_del=0 and sp.isDel=0 and sp.progressVisible=0 + wt.is_del=0 and sp.isDel=0 and sp.progressVisible=0 and wt.data_type = #{dataType} and sp.deptId = #{nowDept} and wt.train_type = #{trainType}