Merge remote-tracking branch 'origin/master'

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/targetroom/listener/RoomListener.java

@@ -27,7 +27,7 @@ public class RoomListener implements CommonDataChangeListener {
             param.setName("未分类");
             dataIdList.forEach(orgId -> {
                 param.setCreateOrg(orgId);
-                targetRoomService.add(param);
+                targetRoomService.addWithOrg(param);
             });
         }
     }

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/targetroom/service/TargetRoomService.java

@@ -96,4 +96,5 @@ public interface TargetRoomService extends IService<TargetRoom> {
      */
     List<RoomMonitor> getListByFloor(String floor,String createOrg);
 
+    void addWithOrg(TargetRoomAddParam param);
 }

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/targetroom/service/impl/TargetRoomServiceImpl.java

@@ -80,7 +80,6 @@ public class TargetRoomServiceImpl extends ServiceImpl<TargetRoomMapper, TargetR
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void add(TargetRoomAddParam targetRoomAddParam) {
-        SaBaseLoginUser loginUser = StpLoginUserUtil.getLoginUser();
         if (ifRoomExist(targetRoomAddParam.getName())) {
             throw new CommonException("该房间名已存在！请重新输入");
         }
@@ -186,4 +185,10 @@ public class TargetRoomServiceImpl extends ServiceImpl<TargetRoomMapper, TargetR
         });
         return list;
     }
+
+    @Override
+    public void addWithOrg(TargetRoomAddParam param) {
+        TargetRoom targetRoom = BeanUtil.toBean(param, TargetRoom.class);
+        this.save(targetRoom);
+    }
 }