From 3409868d07fed593bfb6427ec21674cad60767fa Mon Sep 17 00:00:00 2001 From: b2894lxlx <517289602@qq.com> Date: Wed, 16 Oct 2024 19:23:05 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=81=E4=B8=9A=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=202=E3=80=81=E6=B7=BB=E5=8A=A0=E6=8E=A8?= =?UTF-8?q?=E8=8D=90=E4=B8=8B=E7=BA=BF=E5=88=97=E8=A1=A8API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/UserRefereeController.java | 55 ++++++++++++++----- .../system/mapper/xml/OrganizationMapper.xml | 3 + .../common/system/mapper/xml/UserMapper.xml | 6 ++ .../system/param/OrganizationParam.java | 4 ++ .../common/system/param/UserParam.java | 5 ++ 5 files changed, 58 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/gxwebsoft/common/system/controller/UserRefereeController.java b/src/main/java/com/gxwebsoft/common/system/controller/UserRefereeController.java index 83e1d8e..743173a 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/UserRefereeController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/UserRefereeController.java @@ -70,7 +70,7 @@ public class UserRefereeController extends BaseController { // 记录当前登录用户id User loginUser = getLoginUser(); if (loginUser != null) { - userReferee.setUserId(loginUser.getUserId()); + userReferee.setUserId(loginUser.getUserId()); } if (userRefereeService.save(userReferee)) { return success("添加成功"); @@ -136,23 +136,48 @@ public class UserRefereeController extends BaseController { @ApiOperation("查询推荐人信息") @GetMapping("/getReferee/{id}") public ApiResult getReferee(@PathVariable("id") Integer id) { - if(id == null){ - return fail("参数错误",null); - } + if (id == null) { + return fail("参数错误", null); + } - final UserReferee referee = userRefereeService.getOne(new LambdaQueryWrapper() - .eq(UserReferee::getUserId, id) - .eq(UserReferee::getDeleted,0)); + final UserReferee referee = userRefereeService.getOne(new LambdaQueryWrapper() + .eq(UserReferee::getUserId, id) + .eq(UserReferee::getDeleted, 0)); - if (ObjectUtil.isEmpty(referee)) { - return fail("查询失败",null); - } + if (ObjectUtil.isEmpty(referee)) { + return fail("查询失败", null); + } - final User user = userService.getByIdRel(referee.getDealerId()); - if (ObjectUtil.isNotEmpty(user)) { - return success(user); - } - return fail("查询失败",null); + final User user = userService.getByIdRel(referee.getDealerId()); + if (ObjectUtil.isNotEmpty(user)) { + return success(user); + } + return fail("查询失败", null); + } + + @ApiOperation("查询推荐人列表") + @GetMapping("/getRefereeList/{id}") + public ApiResult> getRefereeList(@PathVariable("id") Integer id) { + if (id == null) { + return fail("参数错误", null); + } + + final List refereeList = userRefereeService.list(new LambdaQueryWrapper() + .eq(UserReferee::getUserId, id) + .eq(UserReferee::getDeleted, 0)); + + if (ObjectUtil.isEmpty(refereeList)) { + return fail("查询失败", null); + } + + final List users = userService.list( + new LambdaQueryWrapper() + .in(User::getUserId, refereeList.stream().map(UserReferee::getDealerId).toList()) + ); + if (ObjectUtil.isNotEmpty(users)) { + return success(users); + } + return fail("查询失败", null); } } diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/OrganizationMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/OrganizationMapper.xml index 03176b1..47721a3 100644 --- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/OrganizationMapper.xml +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/OrganizationMapper.xml @@ -67,6 +67,9 @@ AND a.leader_id = #{param.leaderId} + + + AND a.estate IS NOT null AND a.comments LIKE CONCAT('%', #{param.comments}, '%') diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml index 0b760d0..b475e0b 100644 --- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml @@ -133,6 +133,12 @@ #{item} + + AND a.organization_id IN + + #{item} + + AND a.phone IN diff --git a/src/main/java/com/gxwebsoft/common/system/param/OrganizationParam.java b/src/main/java/com/gxwebsoft/common/system/param/OrganizationParam.java index 0252f60..92ac123 100644 --- a/src/main/java/com/gxwebsoft/common/system/param/OrganizationParam.java +++ b/src/main/java/com/gxwebsoft/common/system/param/OrganizationParam.java @@ -66,6 +66,10 @@ public class OrganizationParam extends BaseParam { @QueryField(type = QueryType.EQ) private String park; + @ApiModelProperty(value = "有所属产业的企业") + @TableField(exist = false) + private Boolean estateOnly; + @ApiModelProperty(value = "机构图片") @QueryField(type = QueryType.EQ) private String image; diff --git a/src/main/java/com/gxwebsoft/common/system/param/UserParam.java b/src/main/java/com/gxwebsoft/common/system/param/UserParam.java index 9f2b3e5..367fb06 100644 --- a/src/main/java/com/gxwebsoft/common/system/param/UserParam.java +++ b/src/main/java/com/gxwebsoft/common/system/param/UserParam.java @@ -13,6 +13,7 @@ import lombok.EqualsAndHashCode; import java.math.BigDecimal; import java.util.Date; +import java.util.List; import java.util.Set; /** @@ -86,6 +87,10 @@ public class UserParam extends BaseParam { @QueryField(type = QueryType.EQ) private Integer organizationId; + @ApiModelProperty("机构id合集") + @TableField(exist = false) + private Set organizationIds; + @ApiModelProperty("用户分组ID") @QueryField(type = QueryType.EQ) private Integer groupId;