feat: 查询药企和代理商-恢复

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysDeptController.java

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