shawenguan 2 лет назад
Родитель
Сommit
594bbc8279
2 измененных файлов с 5 добавлено и 4 удалено
  1. 3 2
      Scripts/gandart/gandartComposite.js
  2. 2 2
      Scripts/gandart/gandartExchange.js

+ 3 - 2
Scripts/gandart/gandartComposite.js

@@ -139,6 +139,7 @@ async function all() {
 async function checkToCompositeConformingTasks(taskLst) {
 async function checkToCompositeConformingTasks(taskLst) {
     let taskIds = getWillCompositeTaskIds();
     let taskIds = getWillCompositeTaskIds();
     let isFoundOnce = false;
     let isFoundOnce = false;
+    l
     for (let i = 0; i < taskIds.length; i++) {
     for (let i = 0; i < taskIds.length; i++) {
         let taskId = taskIds[i];
         let taskId = taskIds[i];
         let found = false;
         let found = false;
@@ -265,8 +266,8 @@ function checkIsCompositeTaskExec(taskInfo) {
 function getWillCompositeTaskIds() {
 function getWillCompositeTaskIds() {
     let valArr = lk.getVal(GandartConstKey.CompositeTaskId);
     let valArr = lk.getVal(GandartConstKey.CompositeTaskId);
     if (!lk.isEmpty(valArr)) {
     if (!lk.isEmpty(valArr)) {
-        valArr = [];
         let segments = valArr.split('|');
         let segments = valArr.split('|');
+        valArr = [];
         for (let vstr of segments) {
         for (let vstr of segments) {
             valArr.push(Number(vstr));
             valArr.push(Number(vstr));
         }
         }
@@ -279,8 +280,8 @@ function getWillCompositeTaskIds() {
 function getWillCompositeTaskSearchKeys() {
 function getWillCompositeTaskSearchKeys() {
     let keyArr = lk.getVal(GandartConstKey.CompositeTaskSearchKey)
     let keyArr = lk.getVal(GandartConstKey.CompositeTaskSearchKey)
     if (!lk.isEmpty(keyArr)) {
     if (!lk.isEmpty(keyArr)) {
-        keyArr = [];
         let segments = keyArr.split('|');
         let segments = keyArr.split('|');
+        keyArr = [];
         for (let vstr of segments) {
         for (let vstr of segments) {
             keyArr.push(vstr);
             keyArr.push(vstr);
         }
         }

+ 2 - 2
Scripts/gandart/gandartExchange.js

@@ -266,8 +266,8 @@ function checkIsExchangeTaskExec(taskInfo) {
 function getWillExchangeTaskIds() {
 function getWillExchangeTaskIds() {
     let valArr = lk.getVal(GandartConstKey.ExchangeTaskId);
     let valArr = lk.getVal(GandartConstKey.ExchangeTaskId);
     if (!lk.isEmpty(valArr)) {
     if (!lk.isEmpty(valArr)) {
-        valArr = [];
         let segments = valArr.split('|');
         let segments = valArr.split('|');
+        valArr = [];
         for (let vstr of segments) {
         for (let vstr of segments) {
             valArr.push(Number(vstr));
             valArr.push(Number(vstr));
         }
         }
@@ -281,8 +281,8 @@ function getWillExchangeTaskIds() {
 function getWillExchangeTaskSearchKeys() {
 function getWillExchangeTaskSearchKeys() {
     let keyArr = lk.getVal(GandartConstKey.ExchangeTaskSearchKey)
     let keyArr = lk.getVal(GandartConstKey.ExchangeTaskSearchKey)
     if (!lk.isEmpty(keyArr)) {
     if (!lk.isEmpty(keyArr)) {
-        keyArr = [];
         let segments = keyArr.split('|');
         let segments = keyArr.split('|');
+        keyArr = [];
         for (let vstr of segments) {
         for (let vstr of segments) {
             keyArr.push(vstr);
             keyArr.push(vstr);
         }
         }