feat: 团队管理-查询条件修改

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmTeamController.java

@@ -266,11 +266,13 @@ public class WmTeamController {
 	 * 查询团队可选择人员
 	 *
 	 * @param teamId 团队id
+	 * @param realNameOrPhone 姓名或手机号
 	 * @return
 	 */
 	@GetMapping("/list-selectable-user")
-	public R<Map<String, Object>> listSelectableUser(Integer teamId) {
-		Map<String, Object> map = wmTeamService.listSelectableUser(teamId);
+	public R<Map<String, Object>> listSelectableUser(@RequestParam(value = "teamId", required = false) Integer teamId,
+													 @RequestParam(value = "realNameOrPhone", required = false) String realNameOrPhone) {
+		Map<String, Object> map = wmTeamService.listSelectableUser(teamId, realNameOrPhone);
 		return R.ok(map);
 	}
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/mapper/SysUserMapper.java

@@ -25,8 +25,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qunzhixinxi.hnqz.admin.api.dto.UserDTO;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysUser;
 import com.qunzhixinxi.hnqz.admin.api.vo.UserVO;
-import com.qunzhixinxi.hnqz.admin.entity.WmDaAgent;
-import com.qunzhixinxi.hnqz.common.core.util.R;
 import com.qunzhixinxi.hnqz.common.data.datascope.DataScope;
 import com.qunzhixinxi.hnqz.common.data.datascope.DataScopeMapper;
 import org.apache.ibatis.annotations.Mapper;
@@ -103,8 +101,10 @@ public interface SysUserMapper extends DataScopeMapper<SysUser> {
 	 * 根据部门id和角色id查询
 	 *
 	 * @param deptId
+	 * @param realNameOrPhone
 	 * @param roleList
 	 * @return
 	 */
-	List<SysUser> selectByDeptIdAndRoleId(@Param("deptId") Integer deptId, @Param("roleList") List<Integer> roleList);
+	List<SysUser> selectByDeptIdAndRoleId(@Param("deptId") Integer deptId, @Param("realNameOrPhone") String realNameOrPhone,
+										  @Param("roleList") List<Integer> roleList);
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/WmTeamService.java

@@ -17,7 +17,8 @@ public interface WmTeamService extends IService<WmTeam> {
 	 * 查询可选择的人员
 	 *
 	 * @param teamId
+	 * @param userNameOrPhone
 	 * @return
 	 */
-	Map<String, Object> listSelectableUser(Integer teamId);
+	Map<String, Object> listSelectableUser(Integer teamId, String userNameOrPhone);
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmTeamServiceImpl.java

@@ -39,16 +39,17 @@ public class WmTeamServiceImpl extends ServiceImpl<WmTeamMapper, WmTeam> impleme
 	 * 查询可选择的人员
 	 *
 	 * @param teamId
-	 * @return
+	 * @param realNameOrPhone
+     * @return
 	 */
 	@Override
-	public Map<String, Object> listSelectableUser(Integer teamId) {
+	public Map<String, Object> listSelectableUser(Integer teamId, String realNameOrPhone) {
 		Map<String, Object> resultMap = MapUtil.newHashMap(3);
 		Integer deptId = SecurityUtils.getUser().getDeptId();
 		// 查询负责人user（药企管理员或CSO管理员）
-		List<SysUser> leaderUserList = sysUserMapper.selectByDeptIdAndRoleId(deptId, CollectionUtil.toList(3, 4));
+		List<SysUser> leaderUserList = sysUserMapper.selectByDeptIdAndRoleId(deptId, realNameOrPhone, CollectionUtil.toList(3, 4));
 		// 查询组成人员user（兼职学术信息沟通专员）
-		List<SysUser> memberList = sysUserMapper.selectByDeptIdAndRoleId(deptId, CollectionUtil.toList(6));
+		List<SysUser> memberList = sysUserMapper.selectByDeptIdAndRoleId(deptId, realNameOrPhone, CollectionUtil.toList(6));
 		// 该企业下所有团队的已配置人员
 		List<WmTeam> deptTeamList = this.list(Wrappers.<WmTeam>lambdaQuery()
 				.eq(WmTeam::getDeptId, deptId)

hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/SysUserMapper.xml

@@ -678,6 +678,7 @@
 				LEFT JOIN sys_user_role r ON r.user_id = u.user_id
 		WHERE
 			u.dept_id = #{deptId}
+		  AND (u.username LIKE CONCAT('%',#{realNameOrPhone},'%') OR u.realname LIKE CONCAT('%',#{realNameOrPhone},'%'))
 		  AND r.role_id IN (
 			<foreach collection="roleList" item="roleId" index="index" separator=",">
 				#{roleId}