fix: merge wzy

Next wzy

src/pages/rule-engine/Alarm/Log/TabComponent/index.tsx

@@ -149,23 +149,23 @@ const TabComponent = observer((props: Props) => {
         terms: [...terms],
         sorts: [{ name: 'alarmTime', order: 'desc' }],
       })
-      .then(async(resp) => {
+      .then(async (resp) => {
         if (resp.status === 200) {
           const res = await service.getOrgList();
           if (res.status === 200) {
-            resp.result.data.map(item=>{ 
-              if(item.targetType === 'org'){ 
-                res.result.forEach(item2=>{
-                  if(item2.id === item.targetId){
-                    item.targetName = item2.name
+            resp.result.data.map((item) => {
+              if (item.targetType === 'org') {
+                res.result.forEach((item2) => {
+                  if (item2.id === item.targetId) {
+                    item.targetName = item2.name;
                   }
                   //targetName处理之后的
-                  if(item.targetId === item.targetName){
-                    item.targetName = '无'
+                  if (item.targetId === item.targetName) {
+                    item.targetName = '无';
                   }
-                }) 
+                });
               }
-            })
+            });
             setDataSource(resp.result);
           }
         }

src/pages/system/Department/Tree/tree.tsx

@@ -168,7 +168,7 @@ export default (props: TreeProps) => {
       setData({ sortIndex: treeData && treeData.length + 1 });
       setVisible(true);
     }
-  }, [location]);
+  }, [location, treeData]);
 
   useEffect(() => {
     queryTreeData();