|
|
@@ -88,7 +88,7 @@ public class CmsUserController{
|
|
|
private final UserDoubleVerifyCodeChangeRecordMapper userDoubleVerifyCodeChangeRecordMapper;
|
|
|
|
|
|
@GetMapping("/get")
|
|
|
- public Result<SearchResult<UserView>> get(Long id, String otherPhone, Long sharedId, String userid, Long businessId, String sort, String order, Boolean isCert) {
|
|
|
+ public Result<SearchResult<UserView>> get(Long id, String otherPhone, Long sharedId, String userid, Long businessId, String sort, String order, Boolean isCert, Boolean isAbroad) {
|
|
|
MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
|
|
|
String otherSql = StrUtil.EMPTY;
|
|
|
if (StrUtil.isNotBlank(otherPhone)) {
|
|
|
@@ -112,6 +112,12 @@ public class CmsUserController{
|
|
|
}
|
|
|
otherSql += "exists (select 1 from user_cert_record where user_id = u.id)";
|
|
|
}
|
|
|
+ if (isAbroad != null) {
|
|
|
+ if (StrUtil.isNotBlank(otherSql)) {
|
|
|
+ otherSql += " and ";
|
|
|
+ }
|
|
|
+ otherSql += String.format(" %s (select 1 from phone_code pc where pc.phone = u.login_phone and cid is not null and cid != 86)", isAbroad ? "exists" : "not exists");
|
|
|
+ }
|
|
|
if (StrUtil.isNotBlank(otherSql)) {
|
|
|
builder.put("otherConditionSql", otherSql);
|
|
|
}
|