From 1f2d738ee38f4826e4bc13fa56fa2d1bc15a1027 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Fri, 3 Sep 2021 17:24:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E6=9E=84=E7=AE=A1=E7=90=86--=E5=8A=A0?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6=EF=BC=9A=E5=A7=93=E5=90=8D?= =?UTF-8?q?=E5=92=8C=E9=82=AE=E7=AE=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TsInstitutionController.java | 9 +++++---- .../java/com/adc/da/slrs/sarUser/dao/TsUserDao.java | 5 +++-- .../adc/da/slrs/sarUser/service/ITsUserService.java | 2 +- .../slrs/sarUser/service/impl/TsUserServiceImpl.java | 5 +++-- .../resources/mybatis/mapper/sarUser/TsUserMapper.xml | 10 ++++++++-- 5 files changed, 20 insertions(+), 11 deletions(-) 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 beaa8d70..1518b0b5 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 @@ -63,10 +63,11 @@ public class TsInstitutionController extends BaseController { * @return ResponseMessage> */ @ApiOperation("查询机构的人员") - @GetMapping("/user") - public ResponseMessage> getUserByInstitutionId(@RequestParam String institutionId){ - List tsUsers=tsUserService.getUserByInstitutionId(institutionId); - return Result.success(tsUsers); + @PostMapping("/user") + public ResponseMessage getUserByInstitutionId(TsUser tsUser){ +// List tsUsers=tsUserService.getUserByInstitutionId(institutionId); + List tsUserList = tsUserService.getUserByInstitutionId(tsUser); + return Result.success(tsUserList); } @ApiOperation("导入机构数据") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/dao/TsUserDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/dao/TsUserDao.java index 260e3afd..25c9ee05 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/dao/TsUserDao.java +++ b/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 { * @param institutionId：岗位ID * @return List */ - List getUserAndPosition(String institutionId); - + List getUserAndPosition(@Param("TsUser") TsUser tsUser); /** * 通过岗位Id列表查询用户ID列表 * @param positionIds：岗位ID列表 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java index 2be89ea5..e7560a06 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java @@ -25,7 +25,7 @@ public interface ITsUserService extends IService { * @param institutionId：机构ID * @return List */ - List getUserByInstitutionId(String institutionId); + List getUserByInstitutionId(TsUser tsUser); /** * 封禁、解禁用户 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java index 12d7b452..447dbff0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java @@ -64,8 +64,9 @@ public class TsUserServiceImpl extends ServiceImpl implements * @return List */ @Override - public List getUserByInstitutionId(String institutionId) { - return tsUserDao.getUserAndPosition(institutionId); + public List getUserByInstitutionId(TsUser tsUser) { +// return tsUserDao.getUserAndPosition(institutionId); + return tsUserDao.getUserAndPosition(tsUser); } /** diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml index 158d3b20..fea6f6ed 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml @@ -28,13 +28,19 @@ - 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} + + and u.uname like concat('%',#{TsUser.uname},'%') + + + and u.email like concat('%',#{TsUser.email},'%') +