diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml index ff57d79f1..3b8f336e0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml @@ -133,7 +133,7 @@ left join project_name_info as pni on plb.project_name_id = pni.id left join project_year_name_info as pyni on plb.year_name_id=pyni.id ) tmp_tb - where 1=1 and state = #{state} and plb.platform is null + where 1=1 and state = #{state} AND project_name LIKE CONCAT(CONCAT('%',#{projectName}),'%') @@ -153,7 +153,7 @@ left join project_name_info as pni on plb.project_name_id = pni.id left join project_year_name_info as pyni on plb.year_name_id=pyni.id ) tmp_tb - where 1=1 and plb.platform is null and id in + where 1=1 and id in #{item} @@ -175,7 +175,7 @@ left join project_name_info as pni on plb.project_name_id = pni.id left join project_year_name_info as pyni on plb.year_name_id=pyni.id ) tmp_tb - where 1=1 and plb.platform is null and state = #{state} + where 1=1 and state = #{state} and id in( SELECT pm.id AS pm FROM params_manifest pm JOIN ( SELECT id FROM @@ -183,7 +183,7 @@ FROM project_library_base a JOIN mysql.help_topic b ON b.help_topic_id < ( length( a.certification_engineer ) - length( REPLACE ( a.certification_engineer, ',', '' ) ) + 1 )) temp - WHERE user_id = #{userId} and platform is null) a ON pm.project_id = a.id + WHERE user_id = #{userId}) a ON pm.project_id = a.id UNION SELECT DISTINCT pcm.params_manifest_id AS pm FROM params_collect_manifest pcm WHERE sdt = #{userName} and state in('2','5') @@ -211,7 +211,7 @@ left join project_name_info as pni on plb.project_name_id = pni.id left join project_year_name_info as pyni on plb.year_name_id = pyni.id ) tmp_tb - where project_id = #{projectId} and plb.platform is null + where project_id = #{projectId} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java index b475f1391..ae78fd2a6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java @@ -619,6 +619,7 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl