diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java
index 22150189..beaa8d70 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java
@@ -50,10 +50,10 @@ public class TsInstitutionController extends BaseController<TsInstitution> {
      * 查询所有机构和人员
      * @return ResponseMessage<List<TsInstitution>>
      */
-    @ApiOperation("查询所有机构和人员")
+    @ApiOperation("查询所有机构和人员或根据名称查询")
     @GetMapping("/institutionAndUser")
-    public ResponseMessage<List<TsInstitution>> getInstitutionAndUser(){
-        List<TsInstitution> institutions=tsInstitutionService.getInstitutionAndUser();
+    public ResponseMessage<List<TsInstitution>> getInstitutionAndUser(String userName){
+        List<TsInstitution> institutions=tsInstitutionService.getInstitutionAndUser(userName);
         return Result.success(institutions);
     }
 
@@ -76,6 +76,19 @@ public class TsInstitutionController extends BaseController<TsInstitution> {
         return Result.success();
     }
 
+    @ApiOperation("获得下一级的部门和人员")
+    @GetMapping("/getNext")
+    public List<TsInstitution> getNext(String institutionId){
+        return tsInstitutionService.getNext(institutionId);
+    }
+
+    @ApiOperation("获得第一级部门目录")
+    @GetMapping("/getFirstInstitution")
+    public List<TsInstitution> getFirstInstitution(){
+        return tsInstitutionService.getFirst();
+    }
+
+
     public static void main(String[] args) {
 //          System.out.println(json);
     }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java
index 91b59c27..8b8d2ee3 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java
@@ -16,12 +16,26 @@ import java.util.List;
  * @since 2021-06-22
  */
 public interface TsInstitutionDao extends BaseMapper<TsInstitution> {
+    /**
+     * 根据部门id查询此部门的子一级部门
+     * @return
+     */
+    List<TsInstitution> selectNextInstitution(String institutionId);
+
+    /**
+     * 根据部门id查询此部门的子一级人员
+     * @return
+     */
+    List<TsInstitution> selectNextUser(String institutionId);
+
+
+
 
     /**
      * 查询最高级机构及其人员
      * @return List<TsInstitution>
      */
-    List<TsInstitution> selectRootAndUser();
+    List<TsInstitution> selectRootAndUser(String userName);
 
     /**
      * 根据父节点查询机构及其人员
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsInstitution.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsInstitution.java
index 51c3673c..5af267c8 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsInstitution.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsInstitution.java
@@ -15,7 +15,7 @@ import java.util.List;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author zyl
@@ -59,6 +59,11 @@ public class TsInstitution extends BaseEntity {
     @ApiModelProperty("是否有子节点(1有，0没有)")
     private String hasChild;
 
+
+    @ApiModelProperty("用户")
+    private TsUserVO tsUserVO;
+
+
     public TsInstitution() {
     }
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java
index 2bd56f28..688cc318 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java
@@ -20,7 +20,7 @@ public interface ITsInstitutionService extends IService<TsInstitution> {
      */
     List<TsInstitution> getInstitution();
 
-    List<TsInstitution> getInstitutionAndUser();
+    List<TsInstitution> getInstitutionAndUser(String userName);
 
     /**
      * 批量插入机构
@@ -29,4 +29,17 @@ public interface ITsInstitutionService extends IService<TsInstitution> {
     void batchInsert(List<TsInstitution> tsInstitutions);
 
     public void parseInstitution() throws Exception;
+
+    /**
+     * 通过部门id获取他的子一级部门和人员
+     * @param institutionId
+     * @return
+     */
+    public List<TsInstitution> getNext(String institutionId);
+
+    /**
+     * 获得第一级的部门
+     * @return
+     */
+    public List<TsInstitution> getFirst();
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java
index b619ff0c..2e3c47cd 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java
@@ -46,6 +46,9 @@ public class TsInstitutionServiceImpl extends ServiceImpl<TsInstitutionDao, TsIn
         return institutionRoot;
     }
 
+
+
+
     /**
      * 递归获取子机构
      * @param tsInstitution：父机构
@@ -100,15 +103,19 @@ public class TsInstitutionServiceImpl extends ServiceImpl<TsInstitutionDao, TsIn
     }*/
 
     /**
-     * 查询所有机构
+     * 查询时带有userName时以userName为条件查询
+     * 没有时查询所有结果
+     * 根据查询下一级
      */
     @Override
-    public List<TsInstitution> getInstitutionAndUser() {
+    public List<TsInstitution> getInstitutionAndUser(String userName) {
         //查询第一层机构
-        List<TsInstitution> institutionRoot=tsInstitutionDao.selectRootAndUser();
+        List<TsInstitution> institutionRoot=tsInstitutionDao.selectRootAndUser(userName);
+
+        //把查到的数据结构修改,把用户放
         for(TsInstitution tsInstitution:institutionRoot){
             tsInstitution.setDisabled(true);
-            tsInstitution.setChildren(recursionGetInstitutionAndUser(tsInstitution));
+            tsInstitution.setChildren(  recursionGetInstitutionAndUser(tsInstitution)   );
             for(TsUserVO user:tsInstitution.getUsers()){
                 if(tsInstitution.getChildren()==null){
                     tsInstitution.setChildren(new ArrayList<>());
@@ -145,6 +152,7 @@ public class TsInstitutionServiceImpl extends ServiceImpl<TsInstitutionDao, TsIn
         System.out.println(2);
         System.out.println(tsInstitution);
         List<Object> institutionObject=new ArrayList<>();
+        //通过以此部门id作为父id查询它的子部门
         List<TsInstitution> tsInstitutions=tsInstitutionDao.selectAndUserByParent(tsInstitution.getId());
 
         for(TsInstitution tsInstitutionNode:tsInstitutions){
@@ -179,5 +187,30 @@ public class TsInstitutionServiceImpl extends ServiceImpl<TsInstitutionDao, TsIn
         batchInsert(tsInstitutions);
     }
 
+    /**
+     * 通过部门id获得这个部门下的下一级部门
+     * @return
+     */
+    public List<TsInstitution> getNext(String institutionId){
+        List<TsInstitution> tsInstitutions = tsInstitutionDao.selectNextInstitution(institutionId);
+        List<TsInstitution> tsUsers=tsInstitutionDao.selectNextUser(institutionId);
+
+
+        for(TsInstitution tsInstitution:tsInstitutions){
+            tsInstitution.setDisabled(true);
+        }
+        tsInstitutions.addAll(tsUsers);
+        return tsInstitutions;
+    }
+
+
+   public List<TsInstitution> getFirst(){
+        //查询第一层机构
+       List<TsInstitution> tsInstitutions = tsInstitutionDao.selectRootAndUser(null);
+       for(TsInstitution tsInstitution:tsInstitutions){
+           tsInstitution.setDisabled(true);
+       }
+       return tsInstitutions;
+   }
 
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/impl/SarUserStarServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/impl/SarUserStarServiceImpl.java
index 890d219d..d6cdc8c5 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/impl/SarUserStarServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/impl/SarUserStarServiceImpl.java
@@ -51,6 +51,29 @@ public class SarUserStarServiceImpl extends ServiceImpl<SarUserStarDao, SarUserS
     }
 
 
+//        @Override
+//    public ResponseMessage<IPage<SarUserStar>> getUserStarList(PersonCollectEO  personCollectEO) {
+//        if (personCollectEO.getUserId() == null) {
+//            return Result.error("userId不能为空");
+//        } else {
+//
+//            QueryWrapper<SarUserStar> wrapper = new QueryWrapper<>();
+//            wrapper.eq("user_id", personCollectEO.getUserId());
+//            if(personCollectEO.getCollectType()!=null)wrapper.like("COLLECT_TYPE",personCollectEO.getCollectType());
+//            if(personCollectEO.getCollectTitle()!=null)wrapper.like("name",personCollectEO.getCollectTitle());
+//            if(sarUserStarEO.getModular()!=null)wrapper.like("modular",sarUserStarEO.getModular());
+//            if(sarUserStarEO.getInfo()!=null)wrapper.like("info",sarUserStarEO.getInfo());
+//            if(sarUserStarEO.getUrl()!=null)wrapper.like("url",sarUserStarEO.getUrl());
+//            IPage<SarUserStar> page = iSarUserStarService.page(new Page<>(sarUserStarEO.getCurrent(), sarUserStarEO.getSize()), wrapper);
+//            while (page.getRecords().remove(null)) ;
+//            return Result.success(page);
+//        }
+//    }
+
+
+
+
+
     @Override
     public ResponseMessage<IPage<SarUserStar>> deleteList(@RequestBody SarUserStarEO sarUserStars) {
         if (sarUserStars.getUserId() == null) {
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml
index 7b91c84b..1e870059 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml
@@ -14,11 +14,44 @@
             <result column="institution_id" property="institutionId"/>
         </collection>
     </resultMap>
+
+    <resultMap id="TsInstitution" type="com.adc.da.slrs.sarInstitution.entity.TsInstitution">
+        <result column="parent_id" property="parentId"/>
+        <result column="level" property="level"/>
+        <result column="name" property="name"/>
+        <result column="has_child" property="hasChild"/>
+    </resultMap>
+
+    <resultMap id="TsUser" type="com.adc.da.slrs.sarInstitution.entity.TsUserVO">
+        <result column="usid" property="id"/>
+        <result column="account" property="account"/>
+        <result column="uname" property="name"/>
+        <result column="institution_id" property="institutionId"/>
+    </resultMap>
+
+<!--    只查询这个部门下的子一级部门-->
+    <select id="selectNextInstitution" resultMap="TsInstitution">
+        select * from ts_institution
+		WHERE parent_id=#{institutionId}
+    </select>
+
+<!--    只查询这个部门下的子一级人员-->
+    <select id="selectNextUser" resultMap="TsUser">
+        select * from ts_user
+		WHERE institution_id=#{institutionId}
+    </select>
     <select id="selectRootAndUser" resultMap="InstitutionAndUser">
         select i.*,u.usid,u.account,u.uname,u.institution_id from ts_institution i
         left join ts_user u
         on i.id=u.institution_id
-        where i.parent_id not in (select id from ts_institution)
+        <if test="userName == null">
+            where i.parent_id not in (select id from ts_institution)
+        </if>
+
+        <if test="userName != null">
+
+            where u.uname like concat('%','${userName}','%')
+        </if>
     </select>
 
     <select id="selectAndUserByParent" resultMap="InstitutionAndUser">
diff --git a/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java b/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java
index 1d3054c2..c720ea6e 100644
--- a/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java
+++ b/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java
@@ -1,23 +1,21 @@
 package com.adc.da.person.controller;
 
 import com.adc.da.base.web.BaseController;
-import com.adc.da.http.PageInfo;
 import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
-import com.adc.da.person.entity.PersonCollectEO;
+import com.adc.da.person.entity.TsPersonCollect;
 import com.adc.da.person.page.PersonCollectEOPage;
 import com.adc.da.person.service.IPersonCollectEOService;
 import com.adc.da.util.LoginUserUtil;
 import com.adc.da.util.UUIDUtils;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
@@ -28,7 +26,7 @@ import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE;
 @RestController
 @RequestMapping("/${restPath}/person/personCollect")
 @Api(description = "|PersonCollectEO|")
-public class PersonCollectEOController extends BaseController<PersonCollectEO> {
+public class PersonCollectEOController extends BaseController<TsPersonCollect> {
 
     private static final Logger logger = LoggerFactory.getLogger(PersonCollectEOController.class);
 
@@ -45,45 +43,10 @@ public class PersonCollectEOController extends BaseController<PersonCollectEO> {
     **/
     @ApiOperation(value = "|PersonCollectEO|分页查询")
     @GetMapping("/page")
-    public ResponseMessage<PageInfo<PersonCollectEO>> page(Integer pageNo, Integer pageSize, String modeType, String collectTitle) throws Exception {
-        PersonCollectEOPage page = new PersonCollectEOPage();
-        if (StringUtils.isNotEmpty(modeType)) {
-            List<String> collectTypes = new ArrayList<>();
-            switch (modeType) {
-                case "STAND":
-                    collectTypes.add("INLAND_STAND");
-                    collectTypes.add("FOREIGN_STAND");
-                    collectTypes.add("BUSINESS_STAND");
-                    break;
-                case "LAWS":
-                    collectTypes.add("INLAND_LAWS");
-                    collectTypes.add("FOREIGN_LAWS");
-                    break;
-                case "MSG":
-                    collectTypes.add("INLAND_MSG");
-                    collectTypes.add("FOREIGN_MSG");
-                    collectTypes.add("RESOURCE_MSG");
-                    break;
-                    default:break;
-            }
-            page.setCollectTypeList(collectTypes);
-        }
-        if (pageNo != null) {
-            page.setPage(pageNo);
-        }else{
-            page.setPage(1);
-        }
-        if (pageSize != null) {
-            page.setPageSize(pageSize);
-        }else{
-            page.setPageSize(10);
-        }
-        if (StringUtils.isNotEmpty(collectTitle)) {
-            page.setCollectTitle(collectTitle);
-        }
-        page.setUserId(LoginUserUtil.getUserId());
-        List<PersonCollectEO> rows = personCollectEOService.queryByPersonCollectPage(page);
-        return Result.success(getPageInfo(page.getPager(), rows));
+    public ResponseMessage<IPage<TsPersonCollect>> page(Integer pageNo, Integer pageSize, String collectTitle, String userId) throws Exception {
+
+
+        return personCollectEOService.queryCollectByWrapper(pageNo, pageSize,collectTitle,userId);
 
     }
 
@@ -91,7 +54,7 @@ public class PersonCollectEOController extends BaseController<PersonCollectEO> {
     @ApiOperation(value = "|PersonCollectEO|查询")
     @GetMapping("")
 //    @RequiresPermissions("person:personCollect:list")
-    public ResponseMessage<List<PersonCollectEO>> list(PersonCollectEOPage page) throws Exception {
+    public ResponseMessage<List<TsPersonCollect>> list(PersonCollectEOPage page) throws Exception {
         return Result.success(personCollectEOService.queryByList(page));
     }
 
@@ -99,39 +62,44 @@ public class PersonCollectEOController extends BaseController<PersonCollectEO> {
     @ApiOperation(value = "|PersonCollectEO|详情")
     @GetMapping("/{id}")
 //    @RequiresPermissions("person:personCollect:get")
-    public ResponseMessage<PersonCollectEO> find(@PathVariable String id) throws Exception {
+    public ResponseMessage<TsPersonCollect> find(@PathVariable String id) throws Exception {
         return Result.success(personCollectEOService.getById(id));
     }
 
 
     /**
      * 刘寅楠
-     * @param personCollectEO
+     * 收藏国内标准法规
+     * @param tsPersonCollect
      * @return com.adc.da.person.entity.PersonCollectEO
      * @throws Exception
      */
     @ApiOperation(value = "|PersonCollectEO|新增")
     @PostMapping(consumes = APPLICATION_JSON_UTF8_VALUE)
 //    @RequiresPermissions("person:personCollect:create")
-    public ResponseMessage<PersonCollectEO> create(@RequestBody PersonCollectEO personCollectEO) throws Exception {
-        String userId = LoginUserUtil.getUserId();
-        personCollectEO.setId(UUIDUtils.randomUUID20());
-        personCollectEO.setUserId(userId);
-        personCollectEO.setValidFlag(0);
-        personCollectEO.setCreationTime(new Date());
-        personCollectEO.setModifyTime(new Date());
-        personCollectEOService.save(personCollectEO);
-        return Result.success("0","收藏成功,请到'我的收藏'中查看相关信息。",personCollectEO);
+    public ResponseMessage<TsPersonCollect> create(@RequestBody TsPersonCollect tsPersonCollect,String userId) throws Exception {
+    //    String userId = LoginUserUtil.getUserId();
+
+        tsPersonCollect.setId(UUIDUtils.randomUUID20());
+        tsPersonCollect.setUserId(userId);
+        tsPersonCollect.setValidFlag(0);
+        tsPersonCollect.setCreationTime(new Date());
+        tsPersonCollect.setModifyTime(new Date());
+
+
+        personCollectEOService.save(tsPersonCollect);
+
+        return Result.success("0","收藏成功,请到'我的收藏'中查看相关信息。", tsPersonCollect);
     }
 
 
     @ApiOperation(value = "|PersonCollectEO|修改")
     @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE)
 //    @RequiresPermissions("person:personCollect:update")
-    public ResponseMessage<PersonCollectEO> update(@RequestBody PersonCollectEO personCollectEO) throws Exception {
-        personCollectEO.setModifyTime(new Date());
-        personCollectEOService.updateById(personCollectEO);
-        return Result.success(personCollectEO);
+    public ResponseMessage<TsPersonCollect> update(@RequestBody TsPersonCollect tsPersonCollect) throws Exception {
+        tsPersonCollect.setModifyTime(new Date());
+        personCollectEOService.updateById(tsPersonCollect);
+        return Result.success(tsPersonCollect);
     }
 
 
@@ -158,13 +126,13 @@ public class PersonCollectEOController extends BaseController<PersonCollectEO> {
     @ApiOperation(value = "取消收藏")
     @PutMapping("/updateByUserId")
 //    @RequiresPermissions("person:personCollect:updateByUserId") PersonCollectEO
-    public ResponseMessage<PersonCollectEO> updateByUserId(PersonCollectEO personCollectEO) throws Exception {
-        personCollectEO.setValidFlag(1);
-        int result = personCollectEOService.updateByPrimaryKeySelective(personCollectEO);
+    public ResponseMessage<TsPersonCollect> updateByUserId(TsPersonCollect tsPersonCollect) throws Exception {
+        tsPersonCollect.setValidFlag(1);
+        int result = personCollectEOService.updateByPrimaryKeySelective(tsPersonCollect);
         if(result == 1){
-            return Result.success("0","取消成功",personCollectEO);
+            return Result.success("0","取消成功", tsPersonCollect);
         } else {
-            return Result.error("0","取消失败",personCollectEO);
+            return Result.error("0","取消失败", tsPersonCollect);
         }
     }
 
diff --git a/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonCollectEODao.java b/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonCollectEODao.java
index 26c07001..59ddd12e 100644
--- a/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonCollectEODao.java
+++ b/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonCollectEODao.java
@@ -1,7 +1,7 @@
 package com.adc.da.person.dao;
 
 import com.adc.da.base.page.BasePage;
-import com.adc.da.person.entity.PersonCollectEO;
+import com.adc.da.person.entity.TsPersonCollect;
 import com.adc.da.person.page.PersonCollectEOPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
@@ -16,15 +16,15 @@ import java.util.List;
  * <b>日期：</b> 2018-09-03 <br>
  * <b>版权所有：<b>版权归北京卡达克数据技术中心所有。<br>
  */
-public interface PersonCollectEODao extends BaseMapper<PersonCollectEO> {
+public interface PersonCollectEODao extends BaseMapper<TsPersonCollect> {
 
-    public List<PersonCollectEO> queryByList(BasePage page);
+    public List<TsPersonCollect> queryByList(BasePage page);
 
     public int queryByCount(BasePage var1);
 
-    public List<PersonCollectEO> queryByPage(BasePage page);
+    public List<TsPersonCollect> queryByPage(BasePage page);
 
-    public List<PersonCollectEO> queryByPersonCollectPage(PersonCollectEOPage page);
+    public List<TsPersonCollect> queryByPersonCollectPage(PersonCollectEOPage page);
 
     public int queryByPersonCollectPageCount(PersonCollectEOPage page);
 
@@ -34,6 +34,6 @@ public interface PersonCollectEODao extends BaseMapper<PersonCollectEO> {
 
     int deleteByResIdList(@Param("idList") List<String> idList);
 
-    int updateByPrimaryKeySelective(PersonCollectEO personCollectEO);
+    int updateByPrimaryKeySelective(TsPersonCollect tsPersonCollect);
 
 }
diff --git a/adc-da-sys/src/main/java/com/adc/da/person/entity/PersonCollectEO.java b/adc-da-sys/src/main/java/com/adc/da/person/entity/TsPersonCollect.java
similarity index 94%
rename from adc-da-sys/src/main/java/com/adc/da/person/entity/PersonCollectEO.java
rename to adc-da-sys/src/main/java/com/adc/da/person/entity/TsPersonCollect.java
index c7200d51..8a62e5c2 100644
--- a/adc-da-sys/src/main/java/com/adc/da/person/entity/PersonCollectEO.java
+++ b/adc-da-sys/src/main/java/com/adc/da/person/entity/TsPersonCollect.java
@@ -1,6 +1,9 @@
 package com.adc.da.person.entity;
 
 import com.adc.da.base.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.fasterxml.jackson.annotation.JsonFormat;
 
 import java.util.ArrayList;
@@ -13,24 +16,32 @@ import java.util.List;
  * <b>日期：</b> 2018-09-03 <br>
  * <b>版权所有：<b>版权归北京卡达克数据技术中心所有。<br>
  */
-public class PersonCollectEO extends BaseEntity {
-
+public class TsPersonCollect extends BaseEntity {
+    @TableField
     //@org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private Date modifyTime;
     //@org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-
+    @TableField
     private Date creationTime;
+    @TableLogic
     private Integer validFlag;
+    @TableField
     private String collectResId;
+    @TableField
     private String collectInfoUri;
+    @TableField
     private String collectTitle;
+    @TableField
     private String collectType;
+    @TableField
     private String userId;
+    @TableId
     private String id;
 
     //追加字段
+    @TableField(exist = false)
     private List<PersonNoteEO> noteList = new ArrayList<>();
 
 
@@ -94,7 +105,7 @@ public class PersonCollectEO extends BaseEntity {
             default: return null;
         }
     }
-    
+
     /**  **/
     public Date getModifyTime() {
         return this.modifyTime;
diff --git a/adc-da-sys/src/main/java/com/adc/da/person/service/IPersonCollectEOService.java b/adc-da-sys/src/main/java/com/adc/da/person/service/IPersonCollectEOService.java
index e275d28a..b21e938f 100644
--- a/adc-da-sys/src/main/java/com/adc/da/person/service/IPersonCollectEOService.java
+++ b/adc-da-sys/src/main/java/com/adc/da/person/service/IPersonCollectEOService.java
@@ -1,18 +1,20 @@
 package com.adc.da.person.service;
 
-import com.adc.da.person.entity.PersonCollectEO;
+import com.adc.da.http.ResponseMessage;
+import com.adc.da.person.entity.TsPersonCollect;
 import com.adc.da.person.page.PersonCollectEOPage;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
 
-public interface IPersonCollectEOService  extends IService<PersonCollectEO> {
+public interface IPersonCollectEOService  extends IService<TsPersonCollect> {
 
-    public List<PersonCollectEO> queryByPage(PersonCollectEOPage page);
+    public List<TsPersonCollect> queryByPage(PersonCollectEOPage page);
 
-    public List<PersonCollectEO> queryByList(PersonCollectEOPage page);
+    public List<TsPersonCollect> queryByList(PersonCollectEOPage page);
 
-    public List<PersonCollectEO> queryByPersonCollectPage(PersonCollectEOPage page);
+    public List<TsPersonCollect> queryByPersonCollectPage(PersonCollectEOPage page);
 
     public String queryCollectByUserAndId(String collectResId);
 
@@ -20,6 +22,8 @@ public interface IPersonCollectEOService  extends IService<PersonCollectEO> {
 
     public int deleteByResId(String resId);
 
-    int updateByPrimaryKeySelective(PersonCollectEO personCollectEO) throws Exception;
+    int updateByPrimaryKeySelective(TsPersonCollect tsPersonCollect) throws Exception;
+
+    public ResponseMessage<IPage<TsPersonCollect>> queryCollectByWrapper(Integer pageNo, Integer pageSize, String modeType, String collectTitle);
 
 }
diff --git a/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java
index 9035db87..fc781203 100644
--- a/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java
+++ b/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java
@@ -1,14 +1,18 @@
 package com.adc.da.person.service.impl;
 
 import com.adc.da.base.page.BasePage;
+import com.adc.da.http.ResponseMessage;
+import com.adc.da.http.Result;
 import com.adc.da.person.dao.PersonCollectEODao;
-import com.adc.da.person.dao.PersonConfEODao;
 import com.adc.da.person.dao.PersonNoteEODao;
-import com.adc.da.person.entity.PersonCollectEO;
+import com.adc.da.person.entity.TsPersonCollect;
 import com.adc.da.person.entity.PersonNoteEO;
 import com.adc.da.person.page.PersonCollectEOPage;
 import com.adc.da.person.service.IPersonCollectEOService;
 import com.adc.da.util.LoginUserUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -28,7 +32,7 @@ import java.util.List;
  */
 @Service("personCollectEOService")
 @Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
-public class PersonCollectEOServiceImpl extends ServiceImpl<PersonCollectEODao, PersonCollectEO> implements IPersonCollectEOService {
+public class PersonCollectEOServiceImpl extends ServiceImpl<PersonCollectEODao, TsPersonCollect> implements IPersonCollectEOService {
 
 
 
@@ -38,8 +42,9 @@ public class PersonCollectEOServiceImpl extends ServiceImpl<PersonCollectEODao,
     private PersonCollectEODao personCollectEODao;
 
 
+
     @Override
-    public List<PersonCollectEO> queryByPage(PersonCollectEOPage page) {
+    public List<TsPersonCollect> queryByPage(PersonCollectEOPage page) {
         Integer rowCount = this.queryByCount(page);
         page.getPager().setRowCount(rowCount);
         return this.baseMapper.queryByPage(page);
@@ -50,15 +55,15 @@ public class PersonCollectEOServiceImpl extends ServiceImpl<PersonCollectEODao,
     }
 
     @Override
-    public List<PersonCollectEO> queryByList(PersonCollectEOPage page) {
+    public List<TsPersonCollect> queryByList(PersonCollectEOPage page) {
         return this.baseMapper.queryByList(page);
     }
 
-    public List<PersonCollectEO> queryByPersonCollectPage(PersonCollectEOPage page){
+    public List<TsPersonCollect> queryByPersonCollectPage(PersonCollectEOPage page){
         page.setValidFlag("0");
         int ire = this.baseMapper.queryByPersonCollectPageCount(page);
         page.getPager().setRowCount(ire);
-        List<PersonCollectEO> list = this.baseMapper.queryByPersonCollectPage(page);
+        List<TsPersonCollect> list = this.baseMapper.queryByPersonCollectPage(page);
         for(int i =0;i<list.size();i++){
             PersonNoteEO personNoteEO = new PersonNoteEO();
             personNoteEO.setCollectId(list.get(i).getId());
@@ -81,7 +86,7 @@ public class PersonCollectEOServiceImpl extends ServiceImpl<PersonCollectEODao,
         page.setCollectResId(collectResId);
         page.setUserId(userId);
         page.setValidFlag("0");
-        List<PersonCollectEO> getCollects = this.baseMapper.queryByList(page);
+        List<TsPersonCollect> getCollects = this.baseMapper.queryByList(page);
         String collectId = "";
         if(getCollects != null){
             if(getCollects.size()>0){
@@ -101,7 +106,35 @@ public class PersonCollectEOServiceImpl extends ServiceImpl<PersonCollectEODao,
     }
 
     @Override
-    public int updateByPrimaryKeySelective(PersonCollectEO personCollectEO) throws Exception{
-        return personCollectEODao.updateByPrimaryKeySelective(personCollectEO);
+    public int updateByPrimaryKeySelective(TsPersonCollect tsPersonCollect) throws Exception{
+        return personCollectEODao.updateByPrimaryKeySelective(tsPersonCollect);
     }
+
+
+    @Override
+    public ResponseMessage<IPage<TsPersonCollect>> queryCollectByWrapper(Integer pageNo, Integer pageSize, String collectTitle, String userId) {
+        BasePage basePage = new BasePage();
+        QueryWrapper<TsPersonCollect> wrapper = new QueryWrapper<>();
+        wrapper.eq("user_id",userId);
+        if (collectTitle != null && !collectTitle.equals("")){
+            wrapper.like("collect_title",collectTitle);
+
+        }
+
+        if (pageNo != null) {
+            basePage.setPage(pageNo);
+        }else{
+            basePage.setPage(1);
+        }
+        if (pageSize != null) {
+            basePage.setPageSize(pageSize);
+        }else{
+            basePage.setPageSize(10);
+        }
+
+
+        IPage<TsPersonCollect> page = this.page(new Page<>(basePage.getPage(), basePage.getPageSize()), wrapper);
+        return Result.success(page);
+    }
+
 }
diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/person/PersonCollectEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/person/PersonCollectEOMapper.xml
index 68378140..230c587c 100644
--- a/adc-da-sys/src/main/resources/mybatis/mapper/person/PersonCollectEOMapper.xml
+++ b/adc-da-sys/src/main/resources/mybatis/mapper/person/PersonCollectEOMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.adc.da.person.dao.PersonCollectEODao">
     <!-- Result Map-->
-    <resultMap id="BaseResultMap" type="com.adc.da.person.entity.PersonCollectEO">
+    <resultMap id="BaseResultMap" type="com.adc.da.person.entity.TsPersonCollect">
         <id column="id" property="id"/>
         <result column="modify_time" property="modifyTime"/>
         <result column="creation_time" property="creationTime"/>
@@ -153,7 +153,7 @@
     </sql>
 
     <!-- 插入记录 -->
-    <insert id="insert" parameterType="com.adc.da.person.entity.PersonCollectEO">
+    <insert id="insert" parameterType="com.adc.da.person.entity.TsPersonCollect">
         <!-- <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
             SELECT SEQ_TS_PERSON_COLLECT.NEXTVAL FROM DUAL
         </selectKey> -->
@@ -164,7 +164,7 @@
     </insert>
 
     <!-- 动态插入记录 主键是序列 -->
-    <insert id="insertSelective" parameterType="com.adc.da.person.entity.PersonCollectEO">
+    <insert id="insertSelective" parameterType="com.adc.da.person.entity.TsPersonCollect">
         <!-- <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
         SELECT SEQ_TS_PERSON_COLLECT.NEXTVAL FROM DUAL
     </selectKey> -->
@@ -194,7 +194,7 @@
     </insert>
 
     <!-- 根据pk，修改记录-->
-    <update id="updateByPrimaryKey" parameterType="com.adc.da.person.entity.PersonCollectEO">
+    <update id="updateByPrimaryKey" parameterType="com.adc.da.person.entity.TsPersonCollect">
     update TS_PERSON_COLLECT
        set  modify_time = #{modifyTime},
             creation_time = #{creationTime},
@@ -208,7 +208,7 @@
   </update>
 
     <!-- 修改记录，只修改只不为空的字段 -->
-    <update id="updateByPrimaryKeySelective" parameterType="com.adc.da.person.entity.PersonCollectEO">
+    <update id="updateByPrimaryKeySelective" parameterType="com.adc.da.person.entity.TsPersonCollect">
         update TS_PERSON_COLLECT
         <set>
             <if test="modifyTime != null">
@@ -332,7 +332,7 @@
             ${pager.orderCondition}
         </if>
         order by TS_PERSON_COLLECT.creation_time desc
-        ) tmp_tb where rownum &lt;= ${pager.endIndex})
+        ) as tmp_tb where rownum &lt;= ${pager.endIndex})
         where rn &gt;= ${pager.startIndex}
     </select>
 
@@ -391,4 +391,10 @@
         </where>
     </update>
 
+
+    <select id="selectPageCollect" resultMap="BaseResultMap" parameterType="java.util.Map">
+        select *
+        from ts_pserson_collect
+        where collect_type=#{c}
+    </select>
 </mapper>