用户信息新增 ldap 机构信息

yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/vo/YifuUser.java

@@ -78,8 +78,8 @@ public class YifuUser extends User {
 
 	public YifuUser(String id, Long deptId,String deptName, String username, String nickname,String systemFlag,
 					String password, String phone, boolean enabled, boolean accountNonExpired,
-					boolean credentialsNonExpired, String ldapDn, boolean accountNonLocked,
-					String userGroup, Collection<? extends GrantedAuthority> authorities) {
+					boolean credentialsNonExpired, boolean accountNonLocked,
+					String userGroup, Collection<? extends GrantedAuthority> authorities, String ldapDn) {
 		super(username, password, enabled, accountNonExpired, credentialsNonExpired, accountNonLocked, authorities);
 		this.id = id;
 		this.deptId = deptId;

yifu-common/yifu-common-security/src/main/java/com/yifu.cloud.plus.v1/yifu/common/security/service/YifuUserDetailsService.java

@@ -69,11 +69,11 @@ public interface YifuUserDetailsService extends UserDetailsService, Ordered {
 		SysUser user = info.getSysUser();
 
 		// 构造security用户
-		return new YifuUser(user.getUserId(), user.getDeptId(),user.getDeptName(), user.getUsername(),user.getNickname()
-				,user.getSystemFlag(), SecurityConstants.BCRYPT + user.getPassword(), user.getPhone(),
-				true, true, true,
+		return new YifuUser(user.getUserId(), user.getDeptId(),user.getDeptName(), user.getUsername(),
+				user.getNickname(),user.getSystemFlag(), SecurityConstants.BCRYPT + user.getPassword(),
+				user.getPhone(), true, true, true,
 				StrUtil.equals(user.getLockFlag(), CommonConstants.STATUS_NORMAL),
-				user.getLdapDn(), user.getUserGroup(),authorities);
+				user.getUserGroup(),authorities, user.getLdapDn());
 	}
 
 	/**