Merge remote-tracking branch 'origin/dev_upgrade-1225' into dev_upgrade-1225

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/RiskSourceServiceImpl.java

@@ -704,7 +704,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
             List<Long> failIds = Lists.newArrayList();
             List<Long> successIds = Lists.newArrayList();
             fmeaPointInputitems.forEach(fmeaPointInputitem -> {
-                CheckInputItemRo checkInputItemRo = map.get(fmeaPointInputitem.getInputItemId());
+                CheckInputItemRo checkInputItemRo = map.get(fmeaPointInputitem.getPointInputitemId());
                 if (checkInputItemRo.getStatus().equals("2")) {
                     failIds.add(fmeaPointInputitem.getId());
                     fmeaIds.add(fmeaPointInputitem.getFmeaId());

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_fmea_point_inputitem.xml

@@ -104,7 +104,7 @@
         where
             b.point_id = #{pointId}
         and
-            b.input_item_id in
+            b.id in
             <foreach collection="inputIds" item="item" index="index" separator="," open="(" close=")">
                 #{item}
             </foreach>