|
@ -24,9 +24,9 @@ import com.alibaba.fastjson.JSON; |
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; |
|
|
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; |
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
|
|
import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; |
|
|
import com.elink.esua.epdc.commons.dynamic.datasource.annotation.DataSource; |
|
|
import com.elink.esua.epdc.commons.dynamic.datasource.annotation.DataSource; |
|
|
import com.elink.esua.epdc.commons.mybatis.enums.EpdcDelFlagEnum; |
|
|
import com.elink.esua.epdc.commons.mybatis.enums.EpdcDelFlagEnum; |
|
|
import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; |
|
|
|
|
|
import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; |
|
|
import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; |
|
|
import com.elink.esua.epdc.commons.mybatis.utils.DeptEntityUtils; |
|
|
import com.elink.esua.epdc.commons.mybatis.utils.DeptEntityUtils; |
|
|
import com.elink.esua.epdc.commons.tools.constant.FieldConstant; |
|
|
import com.elink.esua.epdc.commons.tools.constant.FieldConstant; |
|
@ -49,22 +49,9 @@ import com.elink.esua.epdc.dao.UserAuthenticateHistoryDao; |
|
|
import com.elink.esua.epdc.dao.UserDao; |
|
|
import com.elink.esua.epdc.dao.UserDao; |
|
|
import com.elink.esua.epdc.datasources.DataSourceNames; |
|
|
import com.elink.esua.epdc.datasources.DataSourceNames; |
|
|
import com.elink.esua.epdc.dto.*; |
|
|
import com.elink.esua.epdc.dto.*; |
|
|
import com.elink.esua.epdc.dto.epdc.UserCarInfoDTO; |
|
|
|
|
|
import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO; |
|
|
|
|
|
import com.elink.esua.epdc.dto.epdc.form.EpdcUserRegistFormDTO; |
|
|
|
|
|
import com.elink.esua.epdc.dto.epdc.result.*; |
|
|
|
|
|
import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; |
|
|
|
|
|
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; |
|
|
|
|
|
import com.elink.esua.epdc.commons.tools.utils.Result; |
|
|
|
|
|
import com.elink.esua.epdc.constant.AuthenticatedConsant; |
|
|
|
|
|
import com.elink.esua.epdc.constant.UserFieldConsant; |
|
|
|
|
|
import com.elink.esua.epdc.dao.*; |
|
|
|
|
|
import com.elink.esua.epdc.dto.CachingUserInfoDTO; |
|
|
|
|
|
import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; |
|
|
|
|
|
import com.elink.esua.epdc.dto.UserDTO; |
|
|
|
|
|
import com.elink.esua.epdc.dto.UserGridRelationDTO; |
|
|
|
|
|
import com.elink.esua.epdc.dto.epdc.EpdcCompleteAppUserDTO; |
|
|
import com.elink.esua.epdc.dto.epdc.EpdcCompleteAppUserDTO; |
|
|
import com.elink.esua.epdc.dto.epdc.EpdcGridLeaderRegisterDTO; |
|
|
import com.elink.esua.epdc.dto.epdc.EpdcGridLeaderRegisterDTO; |
|
|
|
|
|
import com.elink.esua.epdc.dto.epdc.UserCarInfoDTO; |
|
|
import com.elink.esua.epdc.dto.epdc.form.*; |
|
|
import com.elink.esua.epdc.dto.epdc.form.*; |
|
|
import com.elink.esua.epdc.dto.epdc.result.*; |
|
|
import com.elink.esua.epdc.dto.epdc.result.*; |
|
|
import com.elink.esua.epdc.entity.*; |
|
|
import com.elink.esua.epdc.entity.*; |
|
@ -78,12 +65,6 @@ import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO; |
|
|
import com.elink.esua.epdc.service.*; |
|
|
import com.elink.esua.epdc.service.*; |
|
|
import com.elink.esua.epdc.util.AppUserUtils; |
|
|
import com.elink.esua.epdc.util.AppUserUtils; |
|
|
import com.google.common.collect.Lists; |
|
|
import com.google.common.collect.Lists; |
|
|
import com.elink.esua.epdc.exception.UserModuleErrorCode; |
|
|
|
|
|
import com.elink.esua.epdc.feign.AdminFeignClient; |
|
|
|
|
|
import com.elink.esua.epdc.service.PartyMembersService; |
|
|
|
|
|
import com.elink.esua.epdc.service.UserGridRelationService; |
|
|
|
|
|
import com.elink.esua.epdc.service.UserInvitationRecordService; |
|
|
|
|
|
import com.elink.esua.epdc.service.UserService; |
|
|
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
import org.springframework.stereotype.Service; |
|
|
import org.springframework.stereotype.Service; |
|
@ -94,10 +75,6 @@ import java.io.File; |
|
|
import java.text.ParseException; |
|
|
import java.text.ParseException; |
|
|
import java.text.SimpleDateFormat; |
|
|
import java.text.SimpleDateFormat; |
|
|
import java.util.*; |
|
|
import java.util.*; |
|
|
import java.util.Arrays; |
|
|
|
|
|
import java.util.Date; |
|
|
|
|
|
import java.util.List; |
|
|
|
|
|
import java.util.Map; |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* 用户信息表 |
|
|
* 用户信息表 |
|
@ -1583,6 +1560,12 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
|
public Result getUserByMobile(String mobile) { |
|
|
|
|
|
UserDTO user = baseDao.getUserByMobile(mobile); |
|
|
|
|
|
return new Result().ok(user); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* 用户信息校验 |
|
|
* 用户信息校验 |
|
|
* |
|
|
* |
|
|