smartor.git - Gitblit

			@@ -21,6 +21,7 @@
			import com.smartor.mapper.SysUserDeptMapper;
			import org.apache.commons.lang3.ArrayUtils;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.beans.factory.annotation.Value;
			import org.springframework.security.access.prepost.PreAuthorize;
			import org.springframework.validation.annotation.Validated;
			import org.springframework.web.bind.annotation.*;
			@@ -52,6 +53,9 @@

			@Autowired
			private SysUserDeptMapper sysUserDeptMapper;

			@Value("${isAdmin}")
			private List<Long> isAdmin;

			/**
			* 获取用户列表
			@@ -99,7 +103,7 @@
			userService.checkUserDataScope(userId);
			AjaxResult ajax = AjaxResult.success();
			List<SysRole> roles = roleService.selectRoleAll();
			ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
			ajax.put("roles", isAdmin.contains(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
			ajax.put("posts", postService.selectPostAll());
			if (StringUtils.isNotNull(userId)) {
			SysUser sysUser = userService.selectUserById(userId);
			@@ -213,7 +217,7 @@
			SysUser user = userService.selectUserById(userId);
			List<SysRole> roles = roleService.selectRolesByUserId(userId);
			ajax.put("user", user);
			ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
			ajax.put("roles", isAdmin.contains(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
			return ajax;
			}

			@@ -225,7 +229,7 @@
			@PostMapping("/authRole")
			public AjaxResult insertAuthRole(Long userId, Long[] roleIds) {
			userService.checkUserDataScope(userId);
			userService.insertUserAuth(userId, roleIds,getOrgid());
			userService.insertUserAuth(userId, roleIds, getOrgid());
			return success();
			}