admin

src/main/java/com/smcic/api/admin/controller/LeadersController.java

@@ -1,7 +1,10 @@
 package com.smcic.api.admin.controller;
 
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.ImmutableMap;
+import com.smcic.api.admin.dto.NamePageDTO;
+import com.smcic.api.admin.dto.OrganPageDTO;
 import com.smcic.api.admin.entity.Leaders;
 import com.smcic.api.admin.service.impl.LeadersServiceImpl;
 import com.smcic.core.auth.LoginRequired;
@@ -40,10 +43,10 @@ public class LeadersController {
         leadersService.add(leaders);
     }
 
-    @GetMapping("list/{regionId}")
+    @PostMapping("list")
     @LoginRequired
-    public List<Leaders> list(@PathVariable Long regionId) {
-        return leadersService.listByRegion(regionId);
+    public Page<Leaders> list(@RequestBody OrganPageDTO namePageDTO) {
+        return leadersService.pageList(namePageDTO);
     }
 
     @DeleteMapping("delete/{id}")

src/main/java/com/smcic/api/admin/dto/OrganPageDTO.java

@@ -0,0 +1,13 @@
+package com.smcic.api.admin.dto;
+
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class OrganPageDTO extends NamePageDTO{
+    private Long organId;
+
+    private Long regionId;
+}

src/main/java/com/smcic/api/admin/entity/Leaders.java

@@ -53,5 +53,7 @@ public class Leaders implements Serializable {
      */
     private Integer sort;
 
+    private Long organId;
+
 
 }

src/main/java/com/smcic/api/admin/service/impl/LeadersServiceImpl.java

@@ -1,6 +1,11 @@
 package com.smcic.api.admin.service.impl;
 
 import cn.hutool.core.date.DateTime;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.smcic.api.admin.dto.NamePageDTO;
+import com.smcic.api.admin.dto.OrganPageDTO;
 import com.smcic.api.admin.entity.Leaders;
 import com.smcic.api.admin.mapper.LeadersMapper;
 import com.smcic.api.admin.service.ILeadersService;
@@ -11,6 +16,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import java.sql.Wrapper;
 import java.util.List;
 import java.util.Random;
 
@@ -53,8 +59,14 @@ public class LeadersServiceImpl extends ServiceImpl<LeadersMapper, Leaders> impl
         updateById(leaders);
     }
 
-    public List<Leaders> listByRegion(Long regionId){
-        return lambdaQuery().eq(Leaders::getRegionId, regionId).list();
+    public Page<Leaders> pageList(OrganPageDTO namePageDTO){
+        LambdaQueryWrapper<Leaders> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        return baseMapper.selectPage(new Page<>(namePageDTO.getPage(), namePageDTO.getPageSize()),
+                lambdaQueryWrapper.eq(namePageDTO.getRegionId() > 0, Leaders::getRegionId, namePageDTO.getRegionId())
+                        .eq(namePageDTO.getOrganId() > 0, Leaders::getOrganId, namePageDTO.getOrganId())
+                        .orderByAsc(Leaders::getSort)
+        );
+
     }
 
     public void delete(Long leaderId){

src/test/java/neican.http

@@ -317,14 +317,23 @@ Authorization: {{token}}
   "resume": "履历",
   "level": "级别",
   "regionId": 100100100,
-  "sort": 1
+  "sort": 1,
+  "organId": 1
 }
 
 ### 领导查询
-GET {{ip}}/admin/leaders/list/100100100
+POST {{ip}}/admin/leaders/list
 Content-Type: application/json
 Authorization: {{token}}
 
+{
+  "regionId": 100100100,
+  "organId": 1,
+  "name": "",
+  "page": 1,
+  "pageSize": 10
+}
+
 
 ### 领导修改
 POST {{ip}}/admin/leaders/update
@@ -341,7 +350,8 @@ Authorization: {{token}}
       "level": "级别",
       "regionId": 100100100,
       "status": 0,
-      "sort": 1
+      "sort": 1,
+  "organId": 1
     }