Merge remote-tracking branch 'origin/dev_20230912_Platform' into fix_20230911_UAT

# Conflicts:
#	jero-web/src/common/lang/en-us.js
#	jero-web/src/common/lang/zh-cn.js

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/TodoCenterMapper.xml

@@ -23,11 +23,12 @@
         SELECT pm.id
         FROM params_manifest pm
                  JOIN ( SELECT id FROM
-            ( SELECT id,substring_index( substring_index( a.certification_engineer, ',', b.help_topic_id + 1 ), ',',- 1 ) user_id
+            ( SELECT id,substring_index( substring_index( a.certification_engineer, ',', b.help_topic_id + 1 ), ',',- 1 ) user_id,
+            a.platform
               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}) 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>