From b905fc8ab0a994dd7f897d38dabeab6f275c9762 Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Thu, 29 Apr 2021 19:01:19 +0800
Subject: [PATCH] 20210429v1.1

---
 tall/src/main/java/com/ccsens/tall/service/LwbsService.java   | 4 ----
 .../main/java/com/ccsens/tall/service/UserInfoService.java    | 3 ++-
 tall/src/main/resources/application.yml                       | 4 ++--
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/tall/src/main/java/com/ccsens/tall/service/LwbsService.java b/tall/src/main/java/com/ccsens/tall/service/LwbsService.java
index 8ad885c0..40661c1d 100644
--- a/tall/src/main/java/com/ccsens/tall/service/LwbsService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/LwbsService.java
@@ -1,13 +1,9 @@
 package com.ccsens.tall.service;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.ccsens.tall.bean.dto.LwbsDto;
 import com.ccsens.tall.bean.po.ProRole;
-import com.ccsens.tall.bean.po.ProShow;
-import com.ccsens.tall.bean.po.ProShowExample;
-import com.ccsens.tall.bean.po.ProSubTimeMember;
 import com.ccsens.tall.bean.vo.LwbsVo;
 import com.ccsens.tall.bean.vo.TaskVo;
 import com.ccsens.tall.persist.dao.SysProjectDao;
diff --git a/tall/src/main/java/com/ccsens/tall/service/UserInfoService.java b/tall/src/main/java/com/ccsens/tall/service/UserInfoService.java
index 1cd54e20..4af59a72 100644
--- a/tall/src/main/java/com/ccsens/tall/service/UserInfoService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/UserInfoService.java
@@ -67,9 +67,10 @@ public class UserInfoService implements IUserInfoService{
                 //检查数据库内账号是否存在
                 SysAuthExample sysAuthExample = new SysAuthExample();
                 sysAuthExample.createCriteria().andIdentifyTypeEqualTo((byte) WebConstant.IDENTIFY_TYPE.Account.value)
-                        .andIdentifierEqualTo(changeAccount.getAccount());
+                        .andIdentifierEqualTo(changeAccount.getAccount()).andUserIdNotEqualTo(userId);
                 List<SysAuth> sysAuthList = sysAuthDao.selectByExample(sysAuthExample);
                 if(CollectionUtil.isNotEmpty(sysAuthList)){
+                    redisUtil.del(accountKey);
                     throw new BaseException(CodeEnum.ALREADY_EXIST_ACCOUNT);
                 }
                 //修改账号
diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml
index ebc544af..9e02c3e8 100644
--- a/tall/src/main/resources/application.yml
+++ b/tall/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: test
-    include: util-test,common
+    active: greenvalley
+    include: util-greenvalley,common