20210429v1.1

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;

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);
                 }
                 //修改账号

tall/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: test
-    include: util-test,common
+    active: greenvalley
+    include: util-greenvalley,common