机构管理--加筛选条件：姓名和邮箱

adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java

@@ -63,10 +63,11 @@ public class TsInstitutionController extends BaseController<TsInstitution> {
      * @return ResponseMessage<List<TsUser>>
      */
     @ApiOperation("查询机构的人员")
-    @GetMapping("/user")
+    @PostMapping("/user")
-    public ResponseMessage<List<TsUser>> getUserByInstitutionId(@RequestParam String institutionId){
+    public ResponseMessage<Object> getUserByInstitutionId(TsUser tsUser){
-        List<TsUser> tsUsers=tsUserService.getUserByInstitutionId(institutionId);
+//        List<TsUser> tsUsers=tsUserService.getUserByInstitutionId(institutionId);
-        return Result.success(tsUsers);
+        List<TsUser> tsUserList =  tsUserService.getUserByInstitutionId(tsUser);
+        return Result.success(tsUserList);
     }
 
     @ApiOperation("导入机构数据")

adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/dao/TsUserDao.java

@@ -1,9 +1,11 @@
 package com.adc.da.slrs.sarUser.dao;
 
+import com.adc.da.http.ResponseMessage;
 import com.adc.da.slrs.sarUser.entity.TsUser;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -45,8 +47,7 @@ public interface TsUserDao extends BaseMapper<TsUser> {
      * @param institutionId：岗位ID
      * @return List<TsUser>
      */
-    List<TsUser> getUserAndPosition(String institutionId);
+    List<TsUser> getUserAndPosition(@Param("TsUser") TsUser tsUser);
-
     /**
      * 通过岗位Id列表查询用户ID列表
      * @param positionIds：岗位ID列表

adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java

@@ -25,7 +25,7 @@ public interface ITsUserService extends IService<TsUser> {
      * @param institutionId：机构ID
      * @return List<TsUser>
      */
-    List<TsUser> getUserByInstitutionId(String institutionId);
+    List<TsUser> getUserByInstitutionId(TsUser tsUser);
 
     /**
      * 封禁、解禁用户

adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java

@@ -64,8 +64,9 @@ public class TsUserServiceImpl extends ServiceImpl<TsUserDao, TsUser> implements
      * @return List<TsUser>
      */
     @Override
-    public List<TsUser> getUserByInstitutionId(String institutionId) {
+    public List<TsUser> getUserByInstitutionId(TsUser tsUser) {
-        return tsUserDao.getUserAndPosition(institutionId);
+//        return tsUserDao.getUserAndPosition(institutionId);
+        return tsUserDao.getUserAndPosition(tsUser);
     }
 
     /**

adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml

@@ -28,13 +28,19 @@
         </collection>
     </resultMap>
 
-    <select id="getUserAndPosition" resultMap="UserPosition">
+    <select id="getUserAndPosition" parameterType="com.adc.da.slrs.sarUser.entity.TsUser" resultMap="UserPosition">
         select u.*,p.id p_id,p.name p_name from ts_user u
         left join ts_user_position up
         on u.usid=up.user_id
         left join ts_position p
         on up.position_id=p.id
-        where u.institution_id=#{institutionId}
+        where u.institution_id=#{TsUser.institutionId}
+        <if test="TsUser.uname != null and TsUser.uname != '' ">
+            and u.uname like concat('%',#{TsUser.uname},'%')
+        </if>
+        <if test="TsUser.email != null and TsUser.email != '' ">
+            and u.email like concat('%',#{TsUser.email},'%')
+        </if>
     </select>
 
     <select id="getUserIdsByPositionIds" resultType="String">