Merge remote-tracking branch 'origin/master'

src/main/java/com/gxwebsoft/common/system/controller/UserRefereeController.java

@@ -155,4 +155,29 @@ public class UserRefereeController extends BaseController {
         return fail("查询失败", null);
     }
 
+    @ApiOperation("查询推荐人列表")
+    @GetMapping("/getRefereeList/{id}")
+    public ApiResult<List<User>> getRefereeList(@PathVariable("id") Integer id) {
+        if (id == null) {
+            return fail("参数错误", null);
+        }
+
+        final List<UserReferee> refereeList = userRefereeService.list(new LambdaQueryWrapper<UserReferee>()
+                .eq(UserReferee::getUserId, id)
+                .eq(UserReferee::getDeleted, 0));
+
+        if (ObjectUtil.isEmpty(refereeList)) {
+            return fail("查询失败", null);
+        }
+
+        final List<User> users = userService.list(
+                new LambdaQueryWrapper<User>()
+                        .in(User::getUserId, refereeList.stream().map(UserReferee::getDealerId).toList())
+        );
+        if (ObjectUtil.isNotEmpty(users)) {
+            return success(users);
+        }
+        return fail("查询失败", null);
+    }
+
 }

src/main/java/com/gxwebsoft/common/system/controller/WxLoginController.java

@@ -59,6 +59,8 @@ public class WxLoginController extends BaseController {
     private RedisUtil redisUtil;
     @Resource
     private ConfigProperties config;
+    @Resource
+    private UserRefereeService userRefereeService;
 
     public WxLoginController(StringRedisTemplate redisTemplate) {
         this.redisTemplate = redisTemplate;
@@ -168,6 +170,16 @@ public class WxLoginController extends BaseController {
             userRole.setRoleId(addUser.getRoleId());
             userRoleService.save(userRole);
         }
+        // 绑定关系
+        if (userParam.getSceneType() != null && userParam.getSceneType().equals("save_referee") && userParam.getRefereeId() != null) {
+            UserReferee check = userRefereeService.check(addUser.getUserId(), userParam.getRefereeId());
+            if (check == null) {
+                UserReferee userReferee = new UserReferee();
+                userReferee.setDealerId(addUser.getUserId());
+                userReferee.setUserId(userParam.getRefereeId());
+                userRefereeService.save(userReferee);
+            }
+        }
         return addUser;
     }
 

src/main/java/com/gxwebsoft/common/system/entity/Organization.java

@@ -86,6 +86,9 @@ public class Organization implements Serializable {
     @ApiModelProperty(value = "所属行业")
     private String industry;
 
+    @ApiModelProperty(value = "所属产业")
+    private String estate;
+
     @ApiModelProperty(value = "负责人id")
     private Integer leaderId;
 

src/main/java/com/gxwebsoft/common/system/mapper/xml/OrganizationMapper.xml

@@ -67,6 +67,9 @@
             </if>
             <if test="param.leaderId != null">
                 AND a.leader_id = #{param.leaderId}
+            </if>
+             <if test="param.estateOnly != null">
+                AND a.estate IS NOT null
             </if>
             <if test="param.comments != null">
                 AND a.comments LIKE CONCAT('%', #{param.comments}, '%')

src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml

@@ -137,6 +137,12 @@
                 #{item}
               </foreach>
             </if>
+            <if test="param.organizationIds != null">
+              AND a.organization_id IN
+              <foreach collection="param.organizationIds" item="item" separator="," open="(" close=")">
+                #{item}
+              </foreach>
+            </if>
             <if test="param.phones != null">
               AND a.phone IN
               <foreach collection="param.phones" item="item" separator="," open="(" close=")">

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;

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<Integer> organizationIds;
+
     @ApiModelProperty("用户分组ID")
     @QueryField(type = QueryType.EQ)
     private Integer groupId;

src/main/java/com/gxwebsoft/common/system/service/UserRefereeService.java

@@ -39,4 +39,5 @@ public interface UserRefereeService extends IService<UserReferee> {
      */
     UserReferee getByIdRel(Integer id);
 
+    UserReferee check(Integer dealerId, Integer userId);
 }

src/main/java/com/gxwebsoft/common/system/service/impl/UserRefereeServiceImpl.java

@@ -1,5 +1,6 @@
 package com.gxwebsoft.common.system.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gxwebsoft.common.system.mapper.UserRefereeMapper;
 import com.gxwebsoft.common.system.service.UserRefereeService;
@@ -44,4 +45,13 @@ public class UserRefereeServiceImpl extends ServiceImpl<UserRefereeMapper, UserR
         return param.getOne(baseMapper.selectListRel(param));
     }
 
+    @Override
+    public UserReferee check(Integer dealerId, Integer userId) {
+        return getOne(
+                new LambdaQueryWrapper<UserReferee>()
+                        .eq(UserReferee::getDealerId, dealerId)
+                        .eq(UserReferee::getUserId, userId)
+        );
+    }
+
 }