From 1c4837172e5dd5f283dae57f593345016cc77423 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Tue, 26 May 2020 15:20:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=90=A5=E7=AB=AF=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/OperRoleUserDao.xml    |  2 +-
 .../com/epmet/service/impl/OperUserServiceImpl.java  | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

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 @@
     </update>
 
     <select id="getRoleIdList" resultType="java.lang.String">
-        select role_id from oper_role_user where user_id = #{value}
+        select role_id from oper_role_user where user_id = #{value} and del_flag = 0
     </select>
 
 </mapper>
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<OperUserDao, OperUserEn
 	private OperUserDao operUserDao;
     @Autowired
     private OperRoleUserFeignClient operRoleUserFeignClient;
+    @Autowired
+    private UserService userService;
 
     @Override
     public PageData<OperUserDTO> page(Map<String, Object> params) {
@@ -91,8 +96,13 @@ public class OperUserServiceImpl extends BaseServiceImpl<OperUserDao, OperUserEn
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void save(OperUserDTO dto) {
-        OperUserEntity entity = ConvertUtils.sourceToTarget(dto, OperUserEntity.class);
+        UserEntity userEntity = new UserEntity();
+        userEntity.setFromClient(AppClientConstant.APP_OPER);
+        userEntity.setFromApp(AppClientConstant.CLIENT_WEB);
+        userService.insert(userEntity);
 
+        OperUserEntity entity = ConvertUtils.sourceToTarget(dto, OperUserEntity.class);
+        entity.setUserId(userEntity.getId());
         //密码加密
         String password = PasswordUtils.encode(entity.getPassword());
         entity.setPassword(password);