|
@@ -33,6 +33,7 @@ import com.qunzhixinxi.hnqz.common.core.util.R;
|
|
|
import com.qunzhixinxi.hnqz.common.log.annotation.SysLog;
|
|
|
import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
|
|
|
import io.swagger.annotations.Api;
|
|
|
+import io.swagger.models.auth.In;
|
|
|
import lombok.AllArgsConstructor;
|
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
@@ -434,12 +435,14 @@ public class SysDeptController {
|
|
|
/**
|
|
|
* 分页查询药企和CSO代理商
|
|
|
*
|
|
|
- * @param page
|
|
|
* @param deptName
|
|
|
* @return
|
|
|
*/
|
|
|
@GetMapping("/list-ent-and-agent")
|
|
|
- public R<?> listEntAndAgent(Page<?> page, @RequestParam(value = "deptName", required = false) String deptName) {
|
|
|
- return R.ok(sysDeptService.listEntAndAgent(page, deptName));
|
|
|
+ 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));
|
|
|
}
|
|
|
}
|