~admin/HangZhouMes.git

			@@ -19,6 +19,7 @@
			import com.mes.userinfo.entity.SysUserRole;
			import com.mes.userinfo.entity.vo.SysUserVO;
			import com.mes.userinfo.mapper.SysUserMapper;
			import com.mes.userinfo.mapper.SysUserRoleMapper;
			import com.mes.userinfo.service.SysUserRoleService;
			import com.mes.userinfo.service.SysUserService;
			import lombok.extern.slf4j.Slf4j;
			@@ -71,13 +72,11 @@

			@Resource
			BCryptPasswordEncoder passwordEncoder;

			@Value("${test.common}")
			private String value;
			@Autowired
			private SysUserRoleMapper sysUserRoleMapper;

			@Override
			public Map<String, String> login(SysUser user) {
			log.info(value);
			UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(user.getUserName(), user.getPassword());
			Authentication authenticate = authenticationManager.authenticate(authenticationToken);
			if (Objects.isNull(authenticate)) {
			@@ -129,10 +128,12 @@
			this.updateById(sysUser);
			log.info("删除用户角色信息");
			List<Long> roleIds = user.getRoleList().stream().map(SysRole::getId).collect(Collectors.toList());
			sysUserRoleService.remove(new LambdaQueryWrapper<SysUserRole>()
			.eq(SysUserRole::getUserId, sysUser.getId()).in(CollectionUtil.isNotEmpty(roleIds), SysUserRole::getRoleId, roleIds));
			log.info("保存用户角色信息");
			saveUserRole(user.getRoleList(), sysUser.getId());
			// sysUserRoleService.remove(new LambdaQueryWrapper<SysUserRole>()
			// .eq(SysUserRole::getUserId, sysUser.getId()).in(CollectionUtil.isNotEmpty(roleIds), SysUserRole::getRoleId, roleIds));
			SysUserRole sysUserRole = new SysUserRole(sysUser.getId(),roleIds.get(0));
			sysUserRoleMapper.updateById(sysUserRole);
			// log.info("保存用户角色信息");
			// saveUserRole(user.getRoleList(), sysUser.getId());
			return user;
			}