lixing преди 4 години
родител
ревизия
110e1215f0

+ 2 - 2
fm-person/src/main/java/com/persagy/fm/person/controller/PersonController.java

@@ -100,8 +100,8 @@ public class PersonController {
     @ApiOperation(value = "根据姓名或用户名分页查询")
     @PostMapping("/queryByNameOrUsername")
     public CommonResult<PageList<ResponsePersonListItemVO>> pageQueryByNameOrUserName(
-            @Valid @RequestBody PageQueryPersonDTO pageQueryPersonDTO) {
-        IPage<ResponsePersonListItemVO> pagedList = personService.pageQueryByNameOrUserName(pageQueryPersonDTO);
+            @Valid @RequestBody PageQueryPersonByNameOrUserNameDTO pageQueryPersonByNameOrUserNameDTO) {
+        IPage<ResponsePersonListItemVO> pagedList = personService.pageQueryByNameOrUserName(pageQueryPersonByNameOrUserNameDTO);
         return ResultHelper.multi(pagedList);
     }
 

+ 3 - 2
fm-person/src/main/java/com/persagy/fm/person/dao/PersonMapper.java

@@ -3,6 +3,7 @@ package com.persagy.fm.person.dao;
 import com.persagy.fm.person.model.Person;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.persagy.fm.person.model.dto.NameQuickSearchDTO;
+import com.persagy.fm.person.model.dto.PageQueryPersonByNameOrUserNameDTO;
 import com.persagy.fm.person.model.dto.PageQueryPersonDTO;
 import com.persagy.fm.person.model.dto.QueryPersonDTO;
 import org.apache.ibatis.annotations.Mapper;
@@ -46,7 +47,7 @@ public interface PersonMapper extends BaseMapper<Person> {
      * @author lixing
      * @version V1.0 2021/4/14 5:53 下午
      */
-    List<Person> queryPersonListByNameOrUserName(PageQueryPersonDTO pageQueryPersonDTO);
+    List<Person> queryPersonListByNameOrUserName(PageQueryPersonByNameOrUserNameDTO pageQueryPersonDTO);
 
     /**
      * 根据人员姓名或用户名查询人员数量
@@ -56,7 +57,7 @@ public interface PersonMapper extends BaseMapper<Person> {
      * @author lixing
      * @version V1.0 2021/4/14 5:53 下午
      */
-    int queryCountByNameOrUserName(PageQueryPersonDTO pageQueryPersonDTO);
+    int queryCountByNameOrUserName(PageQueryPersonByNameOrUserNameDTO pageQueryPersonDTO);
 
     /**
      * 快速查询人员姓名

+ 1 - 1
fm-person/src/main/java/com/persagy/fm/person/service/IPersonService.java

@@ -265,5 +265,5 @@ public interface IPersonService {
      * @author lixing
      * @version V1.0 2021/4/14 4:32 下午
      */
-    IPage<ResponsePersonListItemVO> pageQueryByNameOrUserName(PageQueryPersonDTO pageQueryPersonDTO);
+    IPage<ResponsePersonListItemVO> pageQueryByNameOrUserName(PageQueryPersonByNameOrUserNameDTO pageQueryPersonDTO);
 }

+ 1 - 1
fm-person/src/main/java/com/persagy/fm/person/service/impl/PersonServiceImpl.java

@@ -1120,7 +1120,7 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
     }
 
     @Override
-    public IPage<ResponsePersonListItemVO> pageQueryByNameOrUserName(PageQueryPersonDTO pageQueryPersonDTO) {
+    public IPage<ResponsePersonListItemVO> pageQueryByNameOrUserName(PageQueryPersonByNameOrUserNameDTO pageQueryPersonDTO) {
         List<Person> people = personMapper.queryPersonListByNameOrUserName(pageQueryPersonDTO);
         int total = personMapper.queryCountByNameOrUserName(pageQueryPersonDTO);
 

+ 2 - 2
fm-person/src/main/resources/mapper/PersonMapper.xml

@@ -65,7 +65,7 @@
              work_resume w
     </sql>
 
-    <select id="queryPersonListByNameOrUserName" parameterType="com.persagy.fm.person.model.dto.PageQueryPersonDTO"
+    <select id="queryPersonListByNameOrUserName" parameterType="com.persagy.fm.person.model.dto.PageQueryPersonByNameOrUserNameDTO"
             resultType="com.persagy.fm.person.model.Person">
         <include refid="selectPersonInfo"/>
         <include refid="queryPersonByNameOrUsernameExpression"/>
@@ -73,7 +73,7 @@
         limit #{startIndex}, #{size}
     </select>
 
-    <select id="queryCountByNameOrUserName" parameterType="com.persagy.fm.person.model.dto.PageQueryPersonDTO"
+    <select id="queryCountByNameOrUserName" parameterType="com.persagy.fm.person.model.dto.PageQueryPersonByNameOrUserNameDTO"
             resultType="int">
         select count(*) total
         from person p,