Merge remote-tracking branch 'origin/master'

base-manager-ui/admin/src/pages/basicset/dept/components/addWindowBusiness.vue

@@ -79,7 +79,7 @@
 <script>
 import { getSiteBusinessList } from "@/services/business";
 import { addBusinessToWindow } from "@/services/dept";
-import { extractTree } from "@/utils/util";
+// import { extractTree } from "@/utils/util";
 import local from "@/utils/local";
 const columns = [
   {
@@ -137,12 +137,7 @@ export default {
       await this.getSiteBusinessList();
       this.formData = info;
       if (info.businessIds.length) {
-        let arr = extractTree(this.siteBusinessList, "children").map((v) =>
-          Number(v.id)
-        );
-        this.rowKeys = arr.filter((v) => {
-          return info.businessIds.some((val) => v == val);
-        });
+        this.rowKeys = info.businessIds;
       } else {
         this.rowKeys = [];
       }