diff --git a/ant-design-vue-jeecg/src/mixins/JEditableTableMixin.js b/ant-design-vue-jeecg/src/mixins/JEditableTableMixin.js index d613890..fa17827 100644 --- a/ant-design-vue-jeecg/src/mixins/JEditableTableMixin.js +++ b/ant-design-vue-jeecg/src/mixins/JEditableTableMixin.js @@ -53,6 +53,7 @@ export const JEditableTableMixin = { this.tableReset(); resolve(); }).then(() => { + if (typeof this.addBefore === 'function') this.addBefore() // 默认新增空数据 let rowNum = this.addDefaultRowNum if (typeof rowNum !== 'number') { diff --git a/ant-design-vue-jeecg/src/mixins/JEditableTableModelMixin.js b/ant-design-vue-jeecg/src/mixins/JEditableTableModelMixin.js index 293f9c7..2bad82d 100644 --- a/ant-design-vue-jeecg/src/mixins/JEditableTableModelMixin.js +++ b/ant-design-vue-jeecg/src/mixins/JEditableTableModelMixin.js @@ -51,6 +51,7 @@ export const JEditableTableModelMixin = { this.tableReset(); resolve(); }).then(() => { + if (typeof this.addBefore === 'function') this.addBefore() // 默认新增空数据 let rowNum = this.addDefaultRowNum if (typeof rowNum !== 'number') { diff --git a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/RestUtil.java b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/RestUtil.java index d30b838..28141c2 100644 --- a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/RestUtil.java +++ b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/RestUtil.java @@ -25,6 +25,12 @@ public class RestUtil { public static String getDomain() { if (domain == null) { domain = SpringContextUtils.getDomain(); + // issues/2959 + // 微服务版集成企业微信单点登录 + // 因为微服务版没有端口号,导致 SpringContextUtils.getDomain() 方法获取的域名的端口号变成了:-1所以出问题了,只需要把这个-1给去掉就可以了。 + if (domain.endsWith(":-1")) { + domain = domain.substring(0, domain.length() - 3); + } } return domain; } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppDingtalkServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppDingtalkServiceImpl.java index ff9ff32..0e4b9e0 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppDingtalkServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppDingtalkServiceImpl.java @@ -538,7 +538,6 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService { SysUser sysUser = new SysUser(); BeanUtils.copyProperties(oldSysUser, sysUser); sysUser.setRealname(dtUser.getName()); - sysUser.setPhone(dtUser.getMobile()); sysUser.setTelephone(dtUser.getTelephone()); // 因为唯一键约束的原因,如果原数据和旧数据相同,就不更新