wms / wms4 · Commits

Commit e726be7440e85c61e9903b37cc238ba77e1a0b9b

Authored by zhangdaiscott
1 parent d081ca0a

【issues/I471XE】 钉钉人员同步时手机号未能正确同步 

issues/2959 微服务版集成企业微信单点登录
【issues/2939】JEditable 下子表 addBefore()方法，在其中自定义调用其他方法不生效
Inline Side-by-side
Showing 4 changed files with 8 additions and 1 deletions
ant-design-vue-jeecg/src/mixins/JEditableTableMixin.js
  View file @e726be7
... ... @@ -53,6 +53,7 @@ export const JEditableTableMixin = {
53 53 this.tableReset();
54 54 resolve();
55 55 }).then(() => {
  56 + if (typeof this.addBefore === 'function') this.addBefore()
56 57 // 默认新增空数据
57 58 let rowNum = this.addDefaultRowNum
58 59 if (typeof rowNum !== 'number') {
... ...
ant-design-vue-jeecg/src/mixins/JEditableTableModelMixin.js
  View file @e726be7
... ... @@ -51,6 +51,7 @@ export const JEditableTableModelMixin = {
51 51 this.tableReset();
52 52 resolve();
53 53 }).then(() => {
  54 + if (typeof this.addBefore === 'function') this.addBefore()
54 55 // 默认新增空数据
55 56 let rowNum = this.addDefaultRowNum
56 57 if (typeof rowNum !== 'number') {
... ...
jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/RestUtil.java
  View file @e726be7
... ... @@ -25,6 +25,12 @@ public class RestUtil {
25 25 public static String getDomain() {
26 26 if (domain == null) {
27 27 domain = SpringContextUtils.getDomain();
  28 + // issues/2959
  29 + // 微服务版集成企业微信单点登录
  30 + // 因为微服务版没有端口号，导致 SpringContextUtils.getDomain() 方法获取的域名的端口号变成了:-1所以出问题了，只需要把这个-1给去掉就可以了。
  31 + if (domain.endsWith(":-1")) {
  32 + domain = domain.substring(0, domain.length() - 3);
  33 + }
28 34 }
29 35 return domain;
30 36 }
... ...
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppDingtalkServiceImpl.java
  View file @e726be7
... ... @@ -538,7 +538,6 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService {
538 538 SysUser sysUser = new SysUser();
539 539 BeanUtils.copyProperties(oldSysUser, sysUser);
540 540 sysUser.setRealname(dtUser.getName());
541   - sysUser.setPhone(dtUser.getMobile());
542 541 sysUser.setTelephone(dtUser.getTelephone());
543 542  
544 543 // 因为唯一键约束的原因，如果原数据和旧数据相同，就不更新
... ...