resolve the duplicate issue

ollionorg · Dec 26, 2024 · 250aef4 · 250aef4
1 parent fb9f65d
commit 250aef4
Showing 1 changed file with 21 additions and 9 deletions.
diff --git a/ui/src/app/components/object-detail/object-detail.component.ts b/ui/src/app/components/object-detail/object-detail.component.ts
@@ -918,24 +918,36 @@ export class ObjectDetailComponent implements OnInit {
     let isDuplicate = false;
 
     this.ccArray.value.forEach((cc: ICcTabData) => {
-      if(cc.spConstraintName && cc.spConstraintCondition){
+      if (cc.spConstraintName && cc.spConstraintCondition) {
         if (spCkArr.some(item => item.Name === cc.spConstraintName || item.Expr === cc.spConstraintCondition)) {
           isDuplicate = true;
         } else {
           spCkArr.push({
             Id: cc.spSno,
             Name: cc.spConstraintName,
             Expr: cc.spConstraintCondition,
+            ExprId: cc.spExprId
           });
         }
-     }
-     else{
-      spCkArr.push({
-        Id: cc.spSno,
-        Name: cc.spConstraintName,
-        Expr: cc.spConstraintCondition,
-      });
-     }
+      } else if (cc.spConstraintCondition) {
+        if (spCkArr.some(item => item.Expr === cc.spConstraintCondition)) {
+          isDuplicate = true;
+        } else {
+          spCkArr.push({
+            Id: cc.spSno,
+            Name: cc.spConstraintName,
+            Expr: cc.spConstraintCondition,
+            ExprId: cc.spExprId
+          });
+        }
+      } else {
+        spCkArr.push({
+          Id: cc.spSno,
+          Name: cc.spConstraintName,
+          Expr: cc.spConstraintCondition,
+          ExprId: cc.spExprId
+        });
+      }
     });
 
     if (isDuplicate) {