|
@@ -72,8 +72,8 @@ public class SysDeptController {
|
|
|
* @param id ID
|
|
|
* @return SysDept
|
|
|
*/
|
|
|
- @GetMapping("/{id}")
|
|
|
- public R getById(@PathVariable Integer id) {
|
|
|
+ @GetMapping("/{dept_id}")
|
|
|
+ public R getById(@PathVariable(value = "dept_id") Integer id) {
|
|
|
return R.ok(sysDeptService.getById(id));
|
|
|
}
|
|
|
|
|
@@ -439,7 +439,7 @@ public class SysDeptController {
|
|
|
* @return
|
|
|
*/
|
|
|
@GetMapping("/list-ent-and-agent")
|
|
|
- public R<?> listEntAndAgent(Page page, String deptName) {
|
|
|
+ public R<?> listEntAndAgent(Page<?> page, @RequestParam(value = "deptName", required = false) String deptName) {
|
|
|
return R.ok(sysDeptService.listEntAndAgent(page, deptName));
|
|
|
}
|
|
|
}
|