|
|
@@ -5,26 +5,25 @@ import com.alibaba.fastjson.JSONObject;
|
|
5
|
5
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
6
|
6
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
7
|
7
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
8
|
+import com.huiju.estateagents.base.BaseController;
|
|
8
|
9
|
import com.huiju.estateagents.base.ResponseBean;
|
|
9
|
10
|
import com.huiju.estateagents.center.taUser.entity.TaUser;
|
|
10
|
11
|
import com.huiju.estateagents.center.taUser.service.ITaUserService;
|
|
11
|
12
|
import com.huiju.estateagents.common.CommConstant;
|
|
12
|
|
-import com.huiju.estateagents.common.JWTUtils;
|
|
13
|
13
|
import com.huiju.estateagents.common.SMSUtils;
|
|
14
|
14
|
import com.huiju.estateagents.common.StringUtils;
|
|
15
|
|
-import com.huiju.estateagents.entity.*;
|
|
|
15
|
+import com.huiju.estateagents.entity.TaChannel;
|
|
|
16
|
+import com.huiju.estateagents.entity.TaChannelPerson;
|
|
|
17
|
+import com.huiju.estateagents.entity.TaPerson;
|
|
|
18
|
+import com.huiju.estateagents.entity.TaPersonBuilding;
|
|
16
|
19
|
import com.huiju.estateagents.service.ITaPersonBuildingService;
|
|
17
|
20
|
import com.huiju.estateagents.service.ITaPersonService;
|
|
18
|
21
|
import com.huiju.estateagents.service.TaChannelPersonService;
|
|
19
|
22
|
import com.huiju.estateagents.service.TaChannelService;
|
|
20
|
23
|
import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
|
|
21
|
24
|
import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
|
|
22
|
|
-import org.checkerframework.checker.units.qual.A;
|
|
23
|
|
-import org.checkerframework.checker.units.qual.C;
|
|
24
|
25
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
25
|
26
|
import org.springframework.web.bind.annotation.*;
|
|
26
|
|
-
|
|
27
|
|
-import com.huiju.estateagents.base.BaseController;
|
|
28
|
27
|
import org.springframework.web.client.RestTemplate;
|
|
29
|
28
|
|
|
30
|
29
|
import javax.servlet.http.HttpServletRequest;
|
|
|
@@ -159,7 +158,7 @@ public class TaPersonController extends BaseController {
|
|
159
|
158
|
return ResponseBean.error("您已经成为置业顾问",ResponseBean.ERROR_UNAVAILABLE);
|
|
160
|
159
|
}
|
|
161
|
160
|
QueryWrapper<TaUser>queryWrapper = new QueryWrapper<>();
|
|
162
|
|
- queryWrapper.eq("phone",person.getTel()).or().eq("phone",person.getPhone());
|
|
|
161
|
+ queryWrapper.nested(query -> query.eq("phone", person.getTel()).or().eq("phone", person.getPhone()));
|
|
163
|
162
|
queryWrapper.eq("org_id",orgId);
|
|
164
|
163
|
queryWrapper.eq("status",CommConstant.STATUS_NORMAL);
|
|
165
|
164
|
queryWrapper.eq("is_consultant",true);
|
