修改条件

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

@@ -19,11 +19,11 @@ public interface PersonBasicMapper extends BaseMapper<PersonBasic> {
     List<UserMapperDto> queryPage(Long current, Long size,
                                   String name,
                                   String accountName,
-                                  String projectId);
+                                  String projectName);
 
     List<UserMapperDto> queryPagecount(
             String name,
             String accountName,
-            String projectId);
+            String projectName);
 
 }

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

@@ -28,8 +28,8 @@
             <if test="accountName != null and accountName != ''">
                 AND person_account.account_name like concat(#{accountName},'%')
             </if>
-            <if test="projectId != null and projectId != ''">
-                AND person_ascription.project_id = #{projectId}
+            <if test="projectName != null and projectName != ''">
+                AND person_ascription.project_name like concat(#{projectName},'%')
             </if>
         </where>
         ORDER BY  person_basic.rec_date DESC
@@ -53,8 +53,8 @@
             <if test="accountName != null and accountName != ''">
                 AND person_account.account_name like concat(#{accountName},'%')
             </if>
-            <if test="projectId != null and projectId != ''">
-                AND person_ascription.project_id = #{projectId}
+            <if test="projectName != null and projectName != ''">
+                AND person_ascription.project_name like concat(#{projectName},'%')
             </if>
         </where>
     </select>

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

@@ -102,7 +102,7 @@ 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 = "projectId",required = false)String projectId
+            @RequestParam(value = "projectName",required = false)String projectName
 
     ) {
         Page<UserMapperDto> page = new Page<UserMapperDto>();
@@ -110,7 +110,7 @@ public class PersonBasicController extends BaseController {
         page.setSize(size);
         return ResponseHelper.buildResponse(personBasicServiceImpl.queryPage(page, name,
                 accountName,
-                projectId));
+                projectName));
     }
 
     

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

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