|
|
@ -26,6 +26,8 @@ import org.springframework.validation.annotation.Validated; |
|
|
|
import org.springframework.web.bind.annotation.*; |
|
|
|
|
|
|
|
import jakarta.servlet.http.HttpServletResponse; |
|
|
|
|
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.List; |
|
|
|
|
|
|
|
/** |
|
|
@ -237,10 +239,18 @@ public class SysRoleController extends BaseController { |
|
|
|
@GetMapping(value = "/user/list") |
|
|
|
public R<List<SysUser>> listRoleUser() { |
|
|
|
String roleName = "dispose"; |
|
|
|
String roleJiuLiName = "jiulihu_dipose"; |
|
|
|
|
|
|
|
List<SysUser> resultlist = new ArrayList<>(); |
|
|
|
|
|
|
|
List<SysUser> userList = roleService.getUserIno(roleName); |
|
|
|
List<SysUser> userjiuliList = roleService.getUserIno(roleJiuLiName); |
|
|
|
|
|
|
|
resultlist.addAll(userjiuliList); |
|
|
|
|
|
|
|
resultlist.addAll(userList); |
|
|
|
|
|
|
|
return R.ok(userList); |
|
|
|
return R.ok(resultlist); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|