From 43382ba85caceae73d7b4097e8af2f5c3b133164 Mon Sep 17 00:00:00 2001 From: zyy Date: Sat, 23 May 2020 09:56:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E8=B4=AD=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/service/PoiStoreStaffService.java | 8 +++---- .../store/service/StoreEmployeeService.java | 2 +- .../ic/system/entity/PrivilageUserDO.java | 2 +- .../impl/PrivilageAccountServiceImpl.java | 21 +++++++++++-------- .../impl/PrivilageUserServiceImpl.java | 2 +- 5 files changed, 18 insertions(+), 17 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 2da3a6a..337a292 100644 --- a/src/main/java/com/kiisoo/ic/store/service/PoiStoreStaffService.java +++ b/src/main/java/com/kiisoo/ic/store/service/PoiStoreStaffService.java @@ -62,8 +62,6 @@ public class PoiStoreStaffService { @Autowired private PrivilageDomainService privilageDomainService; @Autowired - private PoiStoreService poiStoreService; - @Autowired private PrivilageUserDOMapper privilageUserDOMapper; @Autowired private StoreEmployeeService storeEmployeeService; @@ -71,8 +69,8 @@ public class PoiStoreStaffService { private PoiStoreDOMapper poiStoreDOMapper; @Autowired private PrivilageCpUserStoreDOMapper privilageCpUserStoreDOMapper; - @Autowired - private PrivilageAccountService privilageAccountService; +// @Autowired +// private PrivilageAccountService privilageAccountService; @Autowired private PrivilageUserService privilageUserService; @Autowired @@ -279,7 +277,7 @@ public class PoiStoreStaffService { privilageUserRoleService.insertUserRoleRelation(userId,privilageRoleDO.getId()); if (StringUtils.isNotBlank(poiStoreStaffVO.getIsOpen())){ //添加一个账号 - privilageAccountService.insertAccount(poiStoreStaffVO.getStaffCode(), AccountEnum.ACCOUNT_FIRST_PWD.getDescribe(), userId); +// privilageAccountService.insertAccount(poiStoreStaffVO.getStaffCode(), AccountEnum.ACCOUNT_FIRST_PWD.getDescribe(), userId); } //去生成一个推广人员二维码 QrCodeDO qrCodeDO = parseQrCodeBSD(poiStoreStaffVO); 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 913356a..139de52 100644 --- a/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java +++ b/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java @@ -1298,7 +1298,7 @@ public class StoreEmployeeService { PrivilageUserDO us = new PrivilageUserDO(); us.setName(shop.getName()); - us.setMobil(poiStoreStaffVO.getMobil()); + us.setMobile(poiStoreStaffVO.getMobil()); us.setEmail(""); us.setAddress(""); us.setStatus(1); diff --git a/src/main/java/com/kiisoo/ic/system/entity/PrivilageUserDO.java b/src/main/java/com/kiisoo/ic/system/entity/PrivilageUserDO.java index 9599ab5..7ad60bc 100644 --- a/src/main/java/com/kiisoo/ic/system/entity/PrivilageUserDO.java +++ b/src/main/java/com/kiisoo/ic/system/entity/PrivilageUserDO.java @@ -41,7 +41,7 @@ public class PrivilageUserDO implements Serializable { /** * 电话 */ - private String mobil; + private String mobile; /** * 邮箱 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 86c5792..46b2260 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 @@ -127,21 +127,24 @@ public class PrivilageAccountServiceImpl extends ServiceImpl listAccountInfo(int pageNum, int pageSize, String searchContent, - Long roleId, Long companyId, Long shopId) { + Long roleId, Long companyId, Long shopId) { PageHelper.startPage(pageNum, pageSize); //根据搜索内容和角色筛选查询 List accountIds = new ArrayList<>(); // 运营人员角色 - if(roleId.equals(3L)){ - accountIds = privilageAccountDOMapper.selectAccountIdByRoleAndSearchContentAndYY(searchContent, roleId, companyId); + if (null != roleId) { + + if (roleId.equals(3L)) { + accountIds = privilageAccountDOMapper.selectAccountIdByRoleAndSearchContentAndYY(searchContent, roleId, companyId); + } } else { accountIds = privilageAccountDOMapper.selectAccountIdByRoleAndSearchContent(searchContent, roleId, companyId, shopId); - if(CollectionUtils.isNotEmpty(accountIds)){ + if (CollectionUtils.isNotEmpty(accountIds)) { for (int i = 0; i < accountIds.size(); i++) { AccountBean item = accountIds.get(i); - if(item.getRoleId().equals(3L)){ + if (item.getRoleId().equals(3L)) { List itemList = privilageAccountDOMapper.selectCompanyNameAndCodeByRoleId(item.getUserId()); - if(CollectionUtils.isNotEmpty(itemList)){ + if (CollectionUtils.isNotEmpty(itemList)) { accountIds.get(i).setCompanyName(itemList.get(0).getCompanyName()); accountIds.get(i).setCompanyCode(itemList.get(0).getCompanyCode()); } @@ -263,7 +266,7 @@ public class PrivilageAccountServiceImpl extends ServiceImpl mobileUserQw = new QueryWrapper<>(); mobileUserQw.eq("mobil", mobil).eq("status", "1"); List mobileUsers = privilageUserDOMapper.selectList(mobileUserQw); - if (CollectionUtils.isNotEmpty(mobileUsers) && !oldUser.getMobil().equals(mobil)) { + if (CollectionUtils.isNotEmpty(mobileUsers) && !oldUser.getMobile().equals(mobil)) { return AccountEnum.ACCOUNT_MODIFY_STATUS_MOBILE_EXISTS.getType(); } @@ -282,7 +285,7 @@ public class PrivilageAccountServiceImpl extends ServiceImpl