|
@ -22,7 +22,6 @@ 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.baomidou.mybatisplus.extension.toolkit.SqlHelper; |
|
|
import com.elink.esua.epdc.commons.mybatis.entity.DeptScope; |
|
|
|
|
|
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; |
|
@ -34,11 +33,8 @@ import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum; |
|
|
import com.elink.esua.epdc.commons.tools.enums.pointsenum.PointsOperationEnum; |
|
|
import com.elink.esua.epdc.commons.tools.enums.pointsenum.PointsOperationEnum; |
|
|
import com.elink.esua.epdc.commons.tools.exception.RenException; |
|
|
import com.elink.esua.epdc.commons.tools.exception.RenException; |
|
|
import com.elink.esua.epdc.commons.tools.page.PageData; |
|
|
import com.elink.esua.epdc.commons.tools.page.PageData; |
|
|
import com.elink.esua.epdc.commons.tools.redis.UserDetailRedis; |
|
|
|
|
|
import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; |
|
|
import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; |
|
|
import com.elink.esua.epdc.commons.tools.security.user.UserDetail; |
|
|
|
|
|
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; |
|
|
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; |
|
|
import com.elink.esua.epdc.commons.tools.utils.MessageUtils; |
|
|
|
|
|
import com.elink.esua.epdc.commons.tools.utils.Result; |
|
|
import com.elink.esua.epdc.commons.tools.utils.Result; |
|
|
import com.elink.esua.epdc.constant.AuthenticatedConsant; |
|
|
import com.elink.esua.epdc.constant.AuthenticatedConsant; |
|
|
import com.elink.esua.epdc.constant.UserFieldConsant; |
|
|
import com.elink.esua.epdc.constant.UserFieldConsant; |
|
@ -61,7 +57,6 @@ import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterAuditMsgResultDTO; |
|
|
import com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO; |
|
|
import com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO; |
|
|
import com.elink.esua.epdc.enums.AppUserAuditStateEnum; |
|
|
import com.elink.esua.epdc.enums.AppUserAuditStateEnum; |
|
|
import com.elink.esua.epdc.enums.AppUserStatesEnum; |
|
|
import com.elink.esua.epdc.enums.AppUserStatesEnum; |
|
|
import com.elink.esua.epdc.exception.UserModuleErrorCode; |
|
|
|
|
|
import com.elink.esua.epdc.feign.AdminFeignClient; |
|
|
import com.elink.esua.epdc.feign.AdminFeignClient; |
|
|
import com.elink.esua.epdc.service.PartyMembersService; |
|
|
import com.elink.esua.epdc.service.PartyMembersService; |
|
|
import com.elink.esua.epdc.service.UserGridRelationService; |
|
|
import com.elink.esua.epdc.service.UserGridRelationService; |
|
@ -111,14 +106,10 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem |
|
|
@Autowired |
|
|
@Autowired |
|
|
private AdminFeignClient adminFeignClient; |
|
|
private AdminFeignClient adminFeignClient; |
|
|
|
|
|
|
|
|
private UserDetailRedis userDetailRedis; |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
public PageData<UserDTO> page(Map<String, Object> params) { |
|
|
public PageData<UserDTO> page(Map<String, Object> params) { |
|
|
this.verifyParams(params); |
|
|
this.verifyParams(params); |
|
|
Long userId = SecurityUser.getUserId(); |
|
|
Long userId = SecurityUser.getUserId(); |
|
|
// 查询当前用户所具有的的数据权限
|
|
|
|
|
|
UserDetail userDetail = userDetailRedis.get(userId); |
|
|
|
|
|
IPage<UserDTO> iPage = this.getPage(params); |
|
|
IPage<UserDTO> iPage = this.getPage(params); |
|
|
List<UserDTO> userDtoList = this.baseDao.selectListUserDto(params); |
|
|
List<UserDTO> userDtoList = this.baseDao.selectListUserDto(params); |
|
|
return new PageData<>(userDtoList, iPage.getTotal()); |
|
|
return new PageData<>(userDtoList, iPage.getTotal()); |
|
@ -366,7 +357,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem |
|
|
userEntity.setFaceImg(null); |
|
|
userEntity.setFaceImg(null); |
|
|
userEntity.setId(userId); |
|
|
userEntity.setId(userId); |
|
|
//用户已绑定手机号时不更新手机号
|
|
|
//用户已绑定手机号时不更新手机号
|
|
|
if(StringUtils.isNotBlank(existUser.getMobile())){ |
|
|
if (StringUtils.isNotBlank(existUser.getMobile())) { |
|
|
userEntity.setMobile(existUser.getMobile()); |
|
|
userEntity.setMobile(existUser.getMobile()); |
|
|
} |
|
|
} |
|
|
this.updateById(userEntity); |
|
|
this.updateById(userEntity); |
|
|