fix(配套设备): 修改BUG

dev-matching/src/main/java/com/tykj/dev/device/matching/repository/MatchingDeviceLibraryDao.java

@@ -29,10 +29,11 @@ public interface MatchingDeviceLibraryDao extends JpaRepository<MatchingDeviceLi
 
         @Transactional
         @Modifying
-        @Query("update MatchingDeviceLibrary m set m.matchingDeviceStatus = :status, m.remake = :remake, m.statusJson = :statusJson where m.id in :matchingDeviceIds")
+        @Query("update MatchingDeviceLibrary m set m.matchingDeviceStatus = :status, m.remake = :remake, m.statusJson = :statusJson, m.stopUnitId = :stopUnitId where m.id in :matchingDeviceIds")
         int batchUpdateStatus(@Param("status") Integer status,
                                  @Param("remake") String remake,
                               @Param("statusJson") String statusJson,
-                              @Param("matchingDeviceIds") List<Integer> matchingDeviceIds);
+                              @Param("matchingDeviceIds") List<Integer> matchingDeviceIds,
+                              @Param("stopUnitId") Integer stopUnitId);
 
 }

dev-matching/src/main/java/com/tykj/dev/device/matching/service/impl/MatchingDeviceLibraryServiceImpl.java

@@ -352,11 +352,12 @@ public class MatchingDeviceLibraryServiceImpl implements MatchingDeviceLibrarySe
         Integer status = statusVO.getStatus();
         String remake = statusVO.getRemake();
         List<Integer> matchingDeviceIds = statusVO.getMatchingDeviceIds();
+        Integer stopUnitId = userUtils.getCurrentUnitId();
         String statusJson =null;
         if (statusVO.getFileRet() != null){
             statusJson = JacksonUtil.toJSon(statusVO.getFileRet());
         }
-        matchingDeviceLibraryDao.batchUpdateStatus(status,remake,statusJson,matchingDeviceIds);
+        matchingDeviceLibraryDao.batchUpdateStatus(status,remake,statusJson,matchingDeviceIds,stopUnitId);
         Integer currentUserId = userUtils.getCurrentUserId();
         //增加日志
         List<DeviceLogDto> deviceLogDtos = new ArrayList<>();