gsb

xggsve-merchant/app/base/service/impl/channel/saaschannelSve.js

@@ -136,11 +136,18 @@ class SaasChannelService extends ServiceBase {
     if(term_end) {
       channel.term_end = term_end;
     }
+    if(term == 1) {
+      channel.term_end = null;
+    }
+
     channel.validity = validity;
     if(validity_end) {
       channel.validity_end = validity_end;
     }
-    
+    if(validity == 1) {
+      channel.validity_end = null;
+    }
+
 
     if (channel.id) {
       await channel.save();

xggsve-merchant/app/base/service/impl/merchant/saasmerchantSve.js

@@ -167,10 +167,16 @@ class SaasMerchantService extends ServiceBase {
     if(term_end) {
       merchant.term_end = term_end;
     }
+    if(term == 1) {
+      merchant.term_end = null;
+    }
     merchant.validity = validity;
     if(validity_end) {
       merchant.validity_end = validity_end;
     }
+    if(validity == 1) {
+      merchant.validity_end = null;
+    }
 
     let self = this;
     if (merchant.id) {