From dc4093d66df2329932a17d8ae7a589f9d63e61dd Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 14 Sep 2023 09:45:41 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E6=8E=89=E5=B9=B3=E5=8F=B0=E4=BB=B6=E7=9A=84=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=EF=BC=88.xml=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/system/mapper/xml/TodoCenterMapper.xml  |  2 +-
 .../collect/mapper/xml/ParamsManifestEOMapper.xml   | 12 ++++++------
 .../cert/report/mapper/xml/ParamsReportEOMapper.xml |  1 +
 .../xml/ParamsReportExportHistoryEOMapper.xml       |  3 ++-
 .../ota/mapper/xml/OtaManageApplyEOMapper.xml       |  3 ++-
 .../mapper/xml/LawsComplianceBoardMapper.xml        |  2 +-
 .../modules/project/mapper/xml/NcrTrackMapper.xml   |  5 ++++-
 .../mapper/xml/ProblemManagementEOMapper.xml        |  3 ++-
 .../project/mapper/xml/ProjectLibraryBaseMapper.xml | 13 ++++++++++---
 .../project/mapper/xml/ProjectRxswinEOMapper.xml    |  4 +++-
 .../todoCenter/mapper/xml/ProcessInfoEOMapper.xml   |  5 +++++
 11 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/TodoCenterMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/TodoCenterMapper.xml
index 75a7e43c2..ff0405564 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/TodoCenterMapper.xml
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/TodoCenterMapper.xml
@@ -27,7 +27,7 @@
               FROM
                   project_library_base a
                       JOIN mysql.help_topic b ON b.help_topic_id &lt; ( length( a.certification_engineer ) - length( REPLACE ( a.certification_engineer, ',', '' ) ) + 1 )) temp
-                        WHERE user_id = #{userId}) a ON pm.project_id = a.id
+                        WHERE user_id = #{userId} and platform is null) a ON pm.project_id = a.id
         where pm.state = #{state}
     </select>
 
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 3b8f336e0..ff57d79f1 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}
+        where 1=1 and state = #{state} and plb.platform is null
           <if test="projectName !=null and projectName !=''">
             AND project_name LIKE CONCAT(CONCAT('%',#{projectName}),'%')
           </if>
@@ -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 id in
+        where 1=1 and plb.platform is null and id in
             <foreach collection="idList" index="index" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>
@@ -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 state = #{state}
+        where 1=1 and plb.platform is null 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 &lt; ( length( a.certification_engineer ) - length( REPLACE ( a.certification_engineer, ',', '' ) ) + 1 )) temp
-                    WHERE user_id = #{userId}) a ON pm.project_id = a.id
+                    WHERE user_id = #{userId} and platform is null) 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}
+        where project_id = #{projectId} and plb.platform is null
     </select>
 
     <select id="labelListForProjectDetails" resultType="java.util.LinkedHashMap">
@@ -232,7 +232,7 @@
               FROM
                   project_library_base a
                       JOIN mysql.help_topic b ON b.help_topic_id &lt; ( length( a.certification_engineer ) - length( REPLACE ( a.certification_engineer, ',', '' ) ) + 1 )) temp
-                        WHERE user_id = #{userId}) a ON pm.project_id = a.id
+                        WHERE user_id = #{userId} and platform is null) a ON pm.project_id = a.id
         where pm.state = #{state}
     </select>
 </mapper>
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportEOMapper.xml
index 8f9924712..435a7ec0c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportEOMapper.xml
@@ -34,6 +34,7 @@
 
     <sql id="BaseQuerySql">
         <where>
+            platform is null
             <if test="paramsReportEO != null">
                 <if test="paramsReportEO.title !=null and paramsReportEO.title !=''">
                     AND title LIKE CONCAT(CONCAT('%',#{paramsReportEO.title}),'%')
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportExportHistoryEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportExportHistoryEOMapper.xml
index 8451ceabe..4087b2fcd 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportExportHistoryEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportExportHistoryEOMapper.xml
@@ -30,6 +30,7 @@
 
     <sql id="BaseQuerySql">
         <where>
+            plb.platform is null
             <if test="paramsReportExportHistoryEO != null">
                 <if test="paramsReportExportHistoryEO.projectName !=null and paramsReportExportHistoryEO.projectName !=''">
                     AND project_name LIKE CONCAT(CONCAT('%',#{paramsReportExportHistoryEO.projectName}),'%')
@@ -57,4 +58,4 @@
         <include refid="BaseQuerySql"/>
         order by export_time desc
     </select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml
index 2edd55c10..cf273c23a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml
@@ -138,6 +138,7 @@
 	    JOIN project_year_name_info pyni ON pyni.id = plb.year_name_id
         where plb.target_market =#{market}
         and pni.project_name =#{car}
+        and plb.platform is null
         GROUP BY plb.id
         ORDER BY project_version asc
     </select>
@@ -160,7 +161,7 @@
 	    LEFT JOIN ota_manage_apply oma ON oma.project_version = plb.id
 	    LEFT JOIN project_name_info pni ON pni.id = plb.project_name_id
 	    LEFT JOIN project_year_name_info pyni ON pyni.project_name_id = pni.id
-        WHERE oma.vdr = #{vdr}
+        WHERE oma.vdr = #{vdr} and plb.platform is null
         GROUP BY plb.id
     </select>
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/LawsComplianceBoardMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/LawsComplianceBoardMapper.xml
index ba76e12e3..001fd64de 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/LawsComplianceBoardMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/LawsComplianceBoardMapper.xml
@@ -108,7 +108,7 @@
                 LEFT JOIN project_name_info pni ON ( pni.id = plb.project_name_id )
                 LEFT JOIN project_year_name_info pyni ON ( pyni.id = plb.year_name_id )
         WHERE
-            1=1
+            1=1 and plb.platform is null
             <if test="params.id != null and params.id != null">
                 and pli.stand_id = #{params.id}
             </if>
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml
index e74921d7a..a700a3eaa 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml
@@ -62,6 +62,7 @@
         LEFT JOIN project_name_info pni ON pni.id = plb.project_name_id
         LEFT JOIN project_year_name_info pyni ON pyni.id = plb.year_name_id
         where
+        plb.platform is null
         <!--<if test="ncrTrackVO.projectLibraryId != null and ncrTrackVO.projectLibraryId != ''">
             plb.id =#{ncrTrackVO.projectLibraryId}
             and
@@ -90,7 +91,7 @@
             (pli.design_duty_id =#{ncrTrackVO.duty} or pli.prehomo_duty_id =#{ncrTrackVO.duty} or pli.verify_duty_id =#{ncrTrackVO.duty})
             and
         </if>-->
-        (
+        and(
         design_flow_status =#{ncrTrackVO.inconformity}
         or verify_flow_status =#{ncrTrackVO.inconformity}
         )
@@ -161,6 +162,7 @@
         LEFT JOIN project_name_info pni ON pni.id = plb.project_name_id
         LEFT JOIN project_year_name_info pyni ON pyni.id = plb.year_name_id
         where
+
         <if test="ncrTrackVO.projectLibraryId != null and ncrTrackVO.projectLibraryId != ''">
             plb.id =#{ncrTrackVO.projectLibraryId}
             and
@@ -193,6 +195,7 @@
         <foreach collection="list" index="index" item="item" open="(" close=")" separator=",">
             #{item}
         </foreach>
+        and plb.platform is null
         order by pli.create_time desc
 
     </select>
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProblemManagementEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProblemManagementEOMapper.xml
index 82ebedceb..d842006a9 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProblemManagementEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProblemManagementEOMapper.xml
@@ -53,8 +53,9 @@
         left join sys_user as studiouser on plb.studio_engineer=studiouser.id
         left join project_year_name_info as pyni on plb.year_name_id=pyni.id
         <where>
+            plb.platform is null
             <if test="ids != null and ids !=''">
-                plb.id in
+                and plb.id in
                 <foreach collection="ids.split(',')" index="index" item="item" open="(" separator="," close=")">
                     #{item}
                 </foreach>
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml
index 0a9425628..de931ad3b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml
@@ -66,11 +66,12 @@
         <include refid="select_item"/>
 
         <where>
+            plb.platform is null
             <if test="params.projectName != null and params.projectName != ''">
                 <!--搜索条件:项目名称,包含%,单独搜索-->
                 <choose>
                     <when test='params.projectName != null and params.projectName != "" and params.projectName.contains("%")'>
-                        ( pni.project_name like '%1%%' escape '1' or pni.project_name like '%1%%' escape '1')
+                        and ( pni.project_name like '%1%%' escape '1' or pni.project_name like '%1%%' escape '1')
                     </when>
                     <otherwise>
             <!--(pni.project_name like concat('%',#{params.projectName},'%') or pyni.year_name like concat('%',#{params.projectName},'%'))-->
@@ -134,7 +135,10 @@
         <include refid="select_item"/>
 
         <where>
+            plb.platform is null
+            and(
             parent_id = '' or parent_id is null
+            )
         </where>
         order by  plb.create_time desc
     </select>
@@ -206,6 +210,7 @@
         <include refid="select_item"/>
 
         <where>
+            plb.platform is null
             <if test="projectLibraryBase.projectName != null and projectLibraryBase.projectName != ''">
                 <!--搜索条件:项目名称,包含%,单独搜索-->
                 <choose>
@@ -273,8 +278,9 @@
     <select id="queryById" resultType="com.jero.modules.project.entity.ProjectLibraryBase">
         <include refid="select_item"/>
         <where>
+            plb.platform is null
             <if test="id != null and id != '' ">
-                plb.id=#{id}
+                and plb.id=#{id}
             </if>
         </where>
         order by plb.create_time desc
@@ -288,7 +294,7 @@
             LEFT JOIN project_name_info pni ON plb.project_name_id = pni.id
             LEFT JOIN project_year_name_info pyni ON plb.year_name_id = pyni.id
         WHERE
-            plb.id = #{projectLibraryId}
+            plb.id = #{projectLibraryId} and platform is null
     </select>
 
     <select id="getListByIds" resultType="com.jero.modules.project.entity.ProjectLibraryBase">
@@ -298,6 +304,7 @@
         <foreach collection="idList" index="index" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
+        and plb.platform is null
         order by plb.create_time desc
     </select>
 </mapper>
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRxswinEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRxswinEOMapper.xml
index ed116b16d..145e0c75e 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRxswinEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRxswinEOMapper.xml
@@ -34,7 +34,9 @@
         	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
         	LEFT JOIN sys_dict_item AS sdi ON sdi.item_value = plb.target_market
-        	where plb.parent_id = #{parentId}
+        	where plb.platform is null and(
+        	plb.parent_id = #{parentId}
         	or plb.id = #{id}
+        	)
     </select>
 </mapper>
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml
index c41daf64f..bc43106a7 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml
@@ -118,6 +118,7 @@
                 left join project_laws_inventory pli on pi.project_laws_inventory_id = pli.id
                 LEFT JOIN buss_document_library bdl ON pi.buss_document_library_id = bdl.id
             <where>
+                plb.platform is null
                 <if test="params.queryType != 'issuedProcess'">
                     and pi.id IN (
                         SELECT
@@ -223,6 +224,7 @@
                      <foreach collection="params.flowTypeList" index="index" item="item" open="(" separator="," close=")">
                         #{item}
                      </foreach>
+                     and plb.platform is null
                union
                SELECT
                    pi.id,
@@ -321,6 +323,7 @@
                     <foreach collection="params.qdqrFlowTypeValue" index="index" item="item" open="(" separator="," close=")">
                         #{item}
                     </foreach>
+                   and plb.platform is null
         )temp
         <include refid="BaseQuerySql"/>
         order by
@@ -467,6 +470,7 @@
                 <foreach collection="params.flowTypeList" index="index" item="item" open="(" separator="," close=")">
                     #{item}
                 </foreach>
+                and plb.platform is null
             union
             SELECT
                 pi.id,
@@ -537,6 +541,7 @@
             <foreach collection="params.qdqrFlowTypeValue" index="index" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>
+            and plb.platform is null
             <if test="params.mobileProcessing == 0">
             union
             SELECT