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 8ed2177..dabf4eb 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 @@ -209,7 +209,7 @@ public class LoginServiceImpl implements LoginService { userId = mobileAccounts.get(0).getUserId(); }else{ QueryWrapper userQw = new QueryWrapper<>(); - userQw.eq("mobile",mobile); + userQw.eq("mobil",mobile); //无账号则绑定账号 List privilageUserDOS = privilageUserDOMapper.selectList(userQw); if (CollectionUtils.isNotEmpty(privilageUserDOS)){ 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 8ef8051..337a292 100644 --- a/src/main/java/com/kiisoo/ic/store/service/PoiStoreStaffService.java +++ b/src/main/java/com/kiisoo/ic/store/service/PoiStoreStaffService.java @@ -246,7 +246,7 @@ public class PoiStoreStaffService { } if (StringUtils.isNotBlank(mobil)){ QueryWrapper mobileUserQw = new QueryWrapper<>(); - mobileUserQw.eq("mobile",mobil).eq("status", "1"); + mobileUserQw.eq("mobil",mobil).eq("status", "1"); List mobileUsers = privilageUserDOMapper.selectList(mobileUserQw); if (CollectionUtils.isNotEmpty(mobileUsers)){ return "0003"; @@ -543,7 +543,7 @@ public class PoiStoreStaffService { PoiStoreStaffVO poiStoreStaffVO = new PoiStoreStaffVO(); //所有列(跟下面的属性对上) String cellNames = "推广人员姓名,工号,手机号,所属店铺,店铺编号,角色"; - List paramList = Arrays.asList("name","staffCode","mobile","storeName","storeCode","role"); + List paramList = Arrays.asList("name","staffCode","mobil","storeName","storeCode","role"); String[] cellNameArr = cellNames.split(","); //必填列 String mustCellNames = "推广人员姓名,工号,所属店铺,店铺编号,角色"; 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 a5f91ad..139de52 100644 --- a/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java +++ b/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java @@ -1289,7 +1289,7 @@ public class StoreEmployeeService { //查看用户 Map userMap = new HashMap<>(); - userMap.put("mobile", poiStoreStaffVO.getStaffCode()); + userMap.put("mobil", poiStoreStaffVO.getStaffCode()); List userList = privilageUserDOMapper.selectByMap(userMap); if (userList.size() > 0) { 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 0c0e76b..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 @@ -163,7 +163,7 @@ public class PrivilageAccountServiceImpl extends ServiceImpl mobileUserQw = new QueryWrapper<>(); - mobileUserQw.eq("mobile", mobil).eq("status", "1"); + mobileUserQw.eq("mobil", mobil).eq("status", "1"); List mobileUsers = privilageUserDOMapper.selectList(mobileUserQw); if (CollectionUtils.isNotEmpty(mobileUsers)) { return "0003"; @@ -264,7 +264,7 @@ public class PrivilageAccountServiceImpl extends ServiceImpl mobileUserQw = new QueryWrapper<>(); - mobileUserQw.eq("mobile", mobil).eq("status", "1"); + mobileUserQw.eq("mobil", mobil).eq("status", "1"); List mobileUsers = privilageUserDOMapper.selectList(mobileUserQw); if (CollectionUtils.isNotEmpty(mobileUsers) && !oldUser.getMobile().equals(mobil)) { return AccountEnum.ACCOUNT_MODIFY_STATUS_MOBILE_EXISTS.getType(); diff --git a/src/main/resources/mapper/PrivilageAccountDOMapper.xml b/src/main/resources/mapper/PrivilageAccountDOMapper.xml index 2ac1807..a31ebbb 100644 --- a/src/main/resources/mapper/PrivilageAccountDOMapper.xml +++ b/src/main/resources/mapper/PrivilageAccountDOMapper.xml @@ -12,7 +12,7 @@ - select t1.id ,t1.name, t1.mobile,t3.name as roleName, t3.id as roleId, t3.code as roleCode + select t1.id ,t1.name, t1.mobil,t3.name as roleName, t3.id as roleId, t3.code as roleCode from privilage_user t1, privilage_user_role t2, privilage_role t3 where t1.id = t2.user_id and t2.role_id = t3.id diff --git a/src/main/resources/mapper/PrivilageUserShopRelationDOMapper.xml b/src/main/resources/mapper/PrivilageUserShopRelationDOMapper.xml index d81b42d..d5e5c41 100644 --- a/src/main/resources/mapper/PrivilageUserShopRelationDOMapper.xml +++ b/src/main/resources/mapper/PrivilageUserShopRelationDOMapper.xml @@ -11,7 +11,7 @@