From 1ff096754aa79b4c70f22d40bf0b88b9229e3f88 Mon Sep 17 00:00:00 2001
From: yechenhao <yechenhao>
Date: Thu, 30 Apr 2020 03:52:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=B7=E6=B1=82=E6=B3=A2=E5=8F=B8=E7=99=BB?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=95=B0=E6=8D=AE=C2=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kiisoo/ic/store/service/PoiStoreStaffService.java    | 1 -
 .../system/service/impl/PrivilageAccountServiceImpl.java | 9 +++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/kiisoo/ic/store/service/PoiStoreStaffService.java b/src/main/java/com/kiisoo/ic/store/service/PoiStoreStaffService.java
index 1d61842..5f60b93 100644
--- a/src/main/java/com/kiisoo/ic/store/service/PoiStoreStaffService.java
+++ b/src/main/java/com/kiisoo/ic/store/service/PoiStoreStaffService.java
@@ -174,7 +174,6 @@ public class PoiStoreStaffService {
             //导购
             wrapper.eq("type", TYPE_SELLER);
             //未删除账号
-            wrapper.eq("deleted", true);
             wrapper.ne("user_id", 0);
             wrapper.orderByDesc("id");
             //返回店铺对应的导购
diff --git a/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageAccountServiceImpl.java b/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageAccountServiceImpl.java
index 23b0f79..bc89264 100644
--- a/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageAccountServiceImpl.java
+++ b/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageAccountServiceImpl.java
@@ -242,6 +242,7 @@ public class PrivilageAccountServiceImpl extends ServiceImpl<PrivilageAccountDOM
         String account = modifyAccountInput.getAccount();
         //查询以前的账号名
         PrivilageAccountDO privilageAccountDO = privilageAccountDOMapper.selectById(modifyAccountInput.getAccountId());
+        PrivilageUserDO oldUser = privilageUserDOMapper.selectById(modifyAccountInput.getUserId());
         String oldLogin = privilageAccountDO.getLogin();
         //修改了账号
         if (!oldLogin.equals(modifyAccountInput.getAccount())) {
@@ -255,7 +256,7 @@ public class PrivilageAccountServiceImpl extends ServiceImpl<PrivilageAccountDOM
         QueryWrapper<PrivilageUserDO> mobileUserQw = new QueryWrapper<>();
         mobileUserQw.eq("mobil", mobil).eq("status", "1");
         List<PrivilageUserDO> mobileUsers = privilageUserDOMapper.selectList(mobileUserQw);
-        if (CollectionUtils.isNotEmpty(mobileUsers)) {
+        if (CollectionUtils.isNotEmpty(mobileUsers) && !oldUser.getMobil().equals(mobil)) {
             return AccountEnum.ACCOUNT_MODIFY_STATUS_MOBILE_EXISTS.getType();
         }
 
@@ -290,10 +291,14 @@ public class PrivilageAccountServiceImpl extends ServiceImpl<PrivilageAccountDOM
 
         //店长维护用户店铺关系1.店长。4.导购
         if (shopId != null && (privilageRoleDO.getCode().equals(RoleEnum.ROLE_CODE_DZ.getRoleCode()) || privilageRoleDO.getCode().equals(RoleEnum.ROLE_CODE_DG.getRoleCode()))) {
+            QueryWrapper<PoiStoreStaff> oldStaffQw = new QueryWrapper<>();
+            oldStaffQw.eq("user_id", userId).eq("status", "1").last("limit 1");
+            PoiStoreStaff oldStaffs = poiStoreStaffDOMapper.selectOne(oldStaffQw);
+
             QueryWrapper<PoiStoreStaff> staffQw = new QueryWrapper<>();
             staffQw.eq("staff_code", account).eq("status", "1");
             List<PoiStoreStaff> staffs = poiStoreStaffDOMapper.selectList(staffQw);
-            if (CollectionUtils.isNotEmpty(staffs)) {
+            if (CollectionUtils.isNotEmpty(staffs) && !oldStaffs.getStaffCode().equals(account)) {
                 return AccountEnum.ACCOUNT_MODIFY_STATUS_STAFF_EXISTS.getType();
             }
             privilageDomainService.saveOneShop(userId, modifyAccountInput.getAccount(), shopId, modifyAccountInput.getType());