diff --git a/src/main/java/com/kiisoo/ic/login/service/impl/LoginServiceImpl.java b/src/main/java/com/kiisoo/ic/login/service/impl/LoginServiceImpl.java index bbd3898..c5aee6e 100644 --- a/src/main/java/com/kiisoo/ic/login/service/impl/LoginServiceImpl.java +++ b/src/main/java/com/kiisoo/ic/login/service/impl/LoginServiceImpl.java @@ -106,6 +106,9 @@ public class LoginServiceImpl implements LoginService { loginBean.setLogin(login); loginInfoMap.put("code", LoginEnum.LOGIN_SUCCEED.getCode()); loginBean.setLoginInfo(loginInfoMap); + if (StringUtils.isNotBlank(roleDO.getCode()) && MINI_ROLE_CODE.contains(roleDO.getCode())){ + return new LoginBean(Constants.ERROR_ROLE_NO_PERMISSION); + } }else { return new LoginBean(Constants.LOGIN_NO_PERMISSIONS); } 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 55ffa48..f1fd529 100644 --- a/src/main/java/com/kiisoo/ic/store/service/PoiStoreStaffService.java +++ b/src/main/java/com/kiisoo/ic/store/service/PoiStoreStaffService.java @@ -120,7 +120,6 @@ public class PoiStoreStaffService { QueryWrapper wrapper2 = new QueryWrapper<>(); wrapper2.eq("store_id",shopId); wrapper2.eq("user_id",poiStoreStaff.getUserId()); - wrapper2.eq("type",1); List opRelations = opSellerCustomerRelationDOMapper.selectList(wrapper2); long count = opRelations.stream().map(OpSellerCustomerRelation::getCustomerId).distinct().count(); poiStoreStaffVO.setCustomerNum((int)count); @@ -261,7 +260,7 @@ public class PoiStoreStaffService { String cpUserId = privilageCpUserStoreDOMapper.selectCpUserIdByStoreId(poiStoreStaffVO.getStoreId()); PoiStore poiStore = poiStoreDOMapper.selectById(poiStoreStaffVO.getStoreId()); - + poiStoreStaffVO.setStoreCode(poiStore.getCode()); String[] data = new String[1]; //选择店铺对应店长的编码 diff --git a/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java b/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java index 7a1f59d..56fb5aa 100644 --- a/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java +++ b/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java @@ -146,7 +146,6 @@ public class StoreEmployeeService { //客户数 QueryWrapper wrapper2 = new QueryWrapper<>(); wrapper2.eq("store_id",cpUserStore.getId()); - wrapper2.eq("type",1); List opRelations = opSellerCustomerRelationDOMapper.selectList(wrapper2); long count = opRelations.stream().map(OpSellerCustomerRelation::getCustomerId).distinct().count(); cpUserStore.setCustomerNum((int)count); 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 4290aa5..989ae1b 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 @@ -157,7 +157,7 @@ public class PrivilageAccountServiceImpl extends ServiceImpl