Merge branch 'master' into docker_package

2022-07-26 19:07:05 +08:00 · 2022-07-26 19:07:05 +08:00 · 0959ac88f4
parent 7ea6145f61 68cf80df1f
commit 0959ac88f4
1 changed files with 3 additions and 0 deletions
--- a/renren-admin/src/main/java/io/renren/modules/monitor/service/MonitorService.java
+++ b/renren-admin/src/main/java/io/renren/modules/monitor/service/MonitorService.java
@ -1138,6 +1138,9 @@ public class MonitorService {
                    getOrgenizationByParent(list,a.getString("id"));
                }
            });
+            if(list != null && list.size() > 0){
+                cameraOrgenMapper.truncate("t_camera_organization");
+            }
            return list;
        }catch (Exception e){
            log.info(e.getMessage());