Browse Source

Merge branch 'dev' into dev-V1.10.4

dev-V1.10.4
vincent 2 hours ago
parent
commit
ef83dbb320
  1. 5
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EnterpriseUser.java
  2. 1
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppEnterpriseLoginServiceImpl.java

5
zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EnterpriseUser.java

@ -84,6 +84,11 @@ public class EnterpriseUser extends TenantEntity {
*/
private String siqUserId;
/**
* 深i企用户标识
*/
private String relUserCuid;
/**
* 账号状态(0正常 1停用)
*/

1
zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppEnterpriseLoginServiceImpl.java

@ -251,6 +251,7 @@ public class AppEnterpriseLoginServiceImpl implements IAppEnterpriseLoginService
user.setPhonenumber(phone);
user.setNickName(userInfo.getString("userName"));
user.setSiqUserId(siqUserId);
user.setRelUserCuid(userInfo.getString("relUserCuid"));
// 设置默认部门ID
user.setDeptId(UserConstants.DEFAULT_DEPT);

Loading…
Cancel
Save