调整页面为树+卡片列表后修改后端接口

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/mapper/PersonBasicMapper.java

@@ -19,12 +19,12 @@ public interface PersonBasicMapper extends BaseMapper<PersonBasic> {
     List<UserMapperDto> queryPage(Long current, Long size,
                                   String name,
                                   String accountName,
-                                  String projectName);
+                                  String projectName,String orgCode);
 
     List<UserMapperDto> queryPagecount(
             String name,
             String accountName,
-            String projectName);
+            String projectName,String orgCode);
 
     int deleteList(String[] ids);
 

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/PersonBasicMapper.xml

@@ -20,7 +20,7 @@
         on person_account.person_id=person_basic.sequence_nbr
         <where>
             person_basic.is_delete=0
-            <if test="name != null and name != ''">
+            <if test="orgCode != null and orgCode != ''">
                 AND person_basic.org_code like concat('%',#{orgCode},'%')
             </if>
             <if test="name != null and name != ''">
@@ -46,7 +46,7 @@
         on person_account.person_id=person_basic.sequence_nbr
         <where>
             person_basic.is_delete=0
-            <if test="name != null and name != ''">
+            <if test="orgCode != null and orgCode != ''">
                 AND person_basic.org_code like concat('%',#{orgCode},'%')
             </if>
             <if test="name != null and name != ''">

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/PersonBasicController.java

@@ -132,7 +132,8 @@ public class PersonBasicController extends BaseController {
             @RequestParam(value = "size") int size,
             @RequestParam(value = "name",required = false) String name,
             @RequestParam(value = "accountName",required = false)String accountName,
-            @RequestParam(value = "projectName",required = false)String projectName
+            @RequestParam(value = "projectName",required = false)String projectName,
+            @RequestParam(value = "orgCode",required = false)String orgCode
 
     ) {
         Page<UserMapperDto> page = new Page<UserMapperDto>();
@@ -140,7 +141,7 @@ public class PersonBasicController extends BaseController {
         page.setSize(size);
         return ResponseHelper.buildResponse(personBasicServiceImpl.queryPage(page, name,
                 accountName,
-                projectName));
+                projectName,orgCode));
     }
 
     

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/PersonBasicServiceImpl.java

@@ -344,14 +344,14 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
     public Page<UserMapperDto> queryPage(Page<UserMapperDto> page,
                                            String name,
                                            String accountName,
-                                           String projectName)   {
+                                           String projectName,String orgCode)   {
 
         List<UserMapperDto> list=personBasicMapper.queryPage((page.getCurrent()-1) * page.getSize(),page.getSize(),  name,
                 accountName,
-                projectName);
+                projectName,orgCode);
         List<UserMapperDto> listcount=personBasicMapper.queryPagecount( name,
                 accountName,
-                projectName);
+                projectName,orgCode);
         page.setTotal(listcount.size());
         page.setRecords(list);
         return page;