优化

assets/js/controllers/inspect/inspectionScopeCtrl.js

@@ -866,14 +866,27 @@ app.directive("zTree", function () {
       }
       // 点击复选框-common
       function zTreeOnCheckCommon(result, nodes) {
-        result = result.map((v) => ({
-          id: v.inspectionType,
-          name: v.inspectionTypeName,
-          group: v.group,
-          user: v.user,
-          parent: v.parent ? { id: v.parent.inspectionType } : undefined,
-          pId: v.parent ? v.parent.inspectionType : 0,
-        }));
+        // 如果有值，则不覆盖
+        if($scope.copyInspectionType.length){
+          result = [];
+          $scope.copyInspectionType.forEach(v=>{
+            result.push(v);
+            if(v.children && v.children.length){
+              v.children.forEach(vv=>{
+                result.push(vv);
+              })
+            }
+          })
+        }else{
+          result = result.map((v) => ({
+            id: v.inspectionType,
+            name: v.inspectionTypeName,
+            group: v.group,
+            user: v.user,
+            parent: v.parent ? { id: v.parent.inspectionType } : undefined,
+            pId: v.parent ? v.parent.inspectionType : 0,
+          }));
+        }
 
         for (var i = 0; i < nodes.length; i++) {
           for (var j = 0; j < result.length; j++) {