diff --git a/epmet-module/oper-access/oper-access-server/src/main/resources/mapper/OperRoleUserDao.xml b/epmet-module/oper-access/oper-access-server/src/main/resources/mapper/OperRoleUserDao.xml index e4e3f7a33d..005ef2451c 100644 --- a/epmet-module/oper-access/oper-access-server/src/main/resources/mapper/OperRoleUserDao.xml +++ b/epmet-module/oper-access/oper-access-server/src/main/resources/mapper/OperRoleUserDao.xml @@ -26,7 +26,7 @@ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/OperUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/OperUserServiceImpl.java index 528313c081..0e6120e9f5 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/OperUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/OperUserServiceImpl.java @@ -20,6 +20,7 @@ package com.epmet.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.enums.SuperAdminEnum; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.password.PasswordUtils; @@ -28,9 +29,11 @@ import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.dao.OperUserDao; import com.epmet.dto.OperUserDTO; import com.epmet.entity.OperUserEntity; +import com.epmet.entity.UserEntity; import com.epmet.feign.OperRoleUserFeignClient; import com.epmet.redis.OperUserRedis; import com.epmet.service.OperUserService; +import com.epmet.service.UserService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -55,6 +58,8 @@ public class OperUserServiceImpl extends BaseServiceImpl page(Map params) { @@ -91,8 +96,13 @@ public class OperUserServiceImpl extends BaseServiceImpl