Merge branch 'fix_20231009' into 'fix_20230911_UAT'

Fix 20231009

See merge request laws-nio/laws-weilai!364

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}
           <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 plb.platform is null and id in
+        where 1=1 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 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 &lt; ( 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}
     </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} and platform is null) a ON pm.project_id = a.id
+                        WHERE user_id = #{userId}) a ON pm.project_id = a.id
         where pm.state = #{state}
     </select>
 </mapper>

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<ParamsManifestEOMap
             for (ParamsCollectManifestEO oldCollectManifestEO : diffList) {
                 ParamsCollectManifestEO updateCollectManifestEO = new ParamsCollectManifestEO();
                 updateCollectManifestEO.setId(oldCollectManifestEO.getId());
+                updateCollectManifestEO.setNioNumber(oldCollectManifestEO.getNioNumber());
                 updateCollectManifestEO.setState(CollectManifestStateEnum.CHANGE.getValue());
                 updateCollectManifestEO.setChangeFlag(CollectManifestChangeFlagEnum.CHANGE_BEFORE.getValue()); // 标记为变更前参数项
                 updateCollectManifestEO.setDelFlag(CollectManifestChangeFlagEnum.DELETE_AFTER.getValue()); // 因新发布模板中没有该参数项，标记为变更时已删除参数项

jero-web/src/common/lang/zh-cn.js

@@ -1863,7 +1863,7 @@ module.exports = {
   NA: '不涉及',
   reviewAndPass: '审查通过',
   reviewAndReturn: '审查退回',
-  electroniccontrollerparameter: '电子控制器参数',
+  electroniccontrollerparameter: '控制器参数',
   marketRegulationListDetails: '市场法规清单详情',
   marketRegulationList: '市场法规清单',
   onlyDataWithTheCurrentCanBeManipulated: '仅能操作责任人为当前用户的数据',
@@ -3769,7 +3769,7 @@ module.exports = {
   NA: '不涉及',
   reviewAndPass: '审查通过',
   reviewAndReturn: '审查退回',
-  electroniccontrollerparameter: '电子控制器参数',
+  electroniccontrollerparameter: '控制器参数',
   marketRegulationListDetails: '市场法规清单详情',
   marketRegulationList: '市场法规清单',
   onlyDataWithTheCurrentCanBeManipulated: '仅能操作责任人为当前用户的数据',