Merge branch 'fix/o2_cloud_update_unit_default_key_bug' into 'wrdp'

修改O2云账号 推送密钥默认值不提交

See merge request o2oa/o2oa!4970

o2web/source/x_component_Collect/Main.js

@@ -941,8 +941,8 @@ MWF.xApplication.Collect.ModifyForm = new Class({
         var user = this.usernameInput.get("value");
         var newName = this.newNameInput.get("value");
         var code = this.codeInput.get("value");
-        var secret = this.secretInput.get("value");
-        var key = this.keyInput.get("value");
+        var secret = this.secretInput.get("value") == this.lp.secret ? "" : this.secretInput.get("value");
+        var key = this.keyInput.get("value")== this.lp.key ? "" : this.keyInput.get("value");
         var mobile = this.mobileInput.get("value");
 
         if (this.newNameVerification()){
@@ -956,6 +956,9 @@ MWF.xApplication.Collect.ModifyForm = new Class({
                 name: user
             };
             this.action.updateUnitCollect(data, function(json){
+                if (user != newName) {
+                    this.usernameInput.set("value", newName);
+                }
                 this.firstStep();
                 this.collect.showContent("checkContentNode");
                 this.collect.backNode.setStyle("display", "none");