huyc 部门根节点数值修改

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

@@ -58,8 +58,14 @@ public class YifuUser extends User {
 	@Getter
 	private String systemFlag;
 
+	/**
+	 * 用户组
+	 */
+	@Getter
+	private final String userGroup;
+
 	public YifuUser(String id, Long deptId, String username, String nickname,String systemFlag, String password, String phone, boolean enabled,
-                    boolean accountNonExpired, boolean credentialsNonExpired, boolean accountNonLocked,
+                    boolean accountNonExpired, boolean credentialsNonExpired, boolean accountNonLocked,String userGroup,
                     Collection<? extends GrantedAuthority> authorities) {
 		super(username, password, enabled, accountNonExpired, credentialsNonExpired, accountNonLocked, authorities);
 		this.id = id;
@@ -67,6 +73,7 @@ public class YifuUser extends User {
 		this.phone = phone;
 		this.nickname = nickname;
 		this.systemFlag = systemFlag;
+		this.userGroup = userGroup;
 	}
 
 }

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

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