将mobile改回mobil

dev_0531
root 5 years ago
parent e0460e4569
commit ab9bf58e98

@ -209,7 +209,7 @@ public class LoginServiceImpl implements LoginService {
userId = mobileAccounts.get(0).getUserId(); userId = mobileAccounts.get(0).getUserId();
}else{ }else{
QueryWrapper<PrivilageUserDO> userQw = new QueryWrapper<>(); QueryWrapper<PrivilageUserDO> userQw = new QueryWrapper<>();
userQw.eq("mobile",mobile); userQw.eq("mobil",mobile);
//无账号则绑定账号 //无账号则绑定账号
List<PrivilageUserDO> privilageUserDOS = privilageUserDOMapper.selectList(userQw); List<PrivilageUserDO> privilageUserDOS = privilageUserDOMapper.selectList(userQw);
if (CollectionUtils.isNotEmpty(privilageUserDOS)){ if (CollectionUtils.isNotEmpty(privilageUserDOS)){

@ -246,7 +246,7 @@ public class PoiStoreStaffService {
} }
if (StringUtils.isNotBlank(mobil)){ if (StringUtils.isNotBlank(mobil)){
QueryWrapper<PrivilageUserDO> mobileUserQw = new QueryWrapper<>(); QueryWrapper<PrivilageUserDO> mobileUserQw = new QueryWrapper<>();
mobileUserQw.eq("mobile",mobil).eq("status", "1"); mobileUserQw.eq("mobil",mobil).eq("status", "1");
List<PrivilageUserDO> mobileUsers = privilageUserDOMapper.selectList(mobileUserQw); List<PrivilageUserDO> mobileUsers = privilageUserDOMapper.selectList(mobileUserQw);
if (CollectionUtils.isNotEmpty(mobileUsers)){ if (CollectionUtils.isNotEmpty(mobileUsers)){
return "0003"; return "0003";
@ -543,7 +543,7 @@ public class PoiStoreStaffService {
PoiStoreStaffVO poiStoreStaffVO = new PoiStoreStaffVO(); PoiStoreStaffVO poiStoreStaffVO = new PoiStoreStaffVO();
//所有列(跟下面的属性对上) //所有列(跟下面的属性对上)
String cellNames = "推广人员姓名,工号,手机号,所属店铺,店铺编号,角色"; String cellNames = "推广人员姓名,工号,手机号,所属店铺,店铺编号,角色";
List<String> paramList = Arrays.asList("name","staffCode","mobile","storeName","storeCode","role"); List<String> paramList = Arrays.asList("name","staffCode","mobil","storeName","storeCode","role");
String[] cellNameArr = cellNames.split(","); String[] cellNameArr = cellNames.split(",");
//必填列 //必填列
String mustCellNames = "推广人员姓名,工号,所属店铺,店铺编号,角色"; String mustCellNames = "推广人员姓名,工号,所属店铺,店铺编号,角色";

@ -1289,7 +1289,7 @@ public class StoreEmployeeService {
//查看用户 //查看用户
Map<String, Object> userMap = new HashMap<>(); Map<String, Object> userMap = new HashMap<>();
userMap.put("mobile", poiStoreStaffVO.getStaffCode()); userMap.put("mobil", poiStoreStaffVO.getStaffCode());
List<PrivilageUserDO> userList = privilageUserDOMapper.selectByMap(userMap); List<PrivilageUserDO> userList = privilageUserDOMapper.selectByMap(userMap);
if (userList.size() > 0) { if (userList.size() > 0) {

@ -163,7 +163,7 @@ public class PrivilageAccountServiceImpl extends ServiceImpl<PrivilageAccountDOM
String mobil = saveAccountInput.getMobil(); String mobil = saveAccountInput.getMobil();
QueryWrapper<PrivilageUserDO> mobileUserQw = new QueryWrapper<>(); QueryWrapper<PrivilageUserDO> mobileUserQw = new QueryWrapper<>();
mobileUserQw.eq("mobile", mobil).eq("status", "1"); mobileUserQw.eq("mobil", mobil).eq("status", "1");
List<PrivilageUserDO> mobileUsers = privilageUserDOMapper.selectList(mobileUserQw); List<PrivilageUserDO> mobileUsers = privilageUserDOMapper.selectList(mobileUserQw);
if (CollectionUtils.isNotEmpty(mobileUsers)) { if (CollectionUtils.isNotEmpty(mobileUsers)) {
return "0003"; return "0003";
@ -264,7 +264,7 @@ public class PrivilageAccountServiceImpl extends ServiceImpl<PrivilageAccountDOM
} }
QueryWrapper<PrivilageUserDO> mobileUserQw = new QueryWrapper<>(); QueryWrapper<PrivilageUserDO> mobileUserQw = new QueryWrapper<>();
mobileUserQw.eq("mobile", mobil).eq("status", "1"); mobileUserQw.eq("mobil", mobil).eq("status", "1");
List<PrivilageUserDO> mobileUsers = privilageUserDOMapper.selectList(mobileUserQw); List<PrivilageUserDO> mobileUsers = privilageUserDOMapper.selectList(mobileUserQw);
if (CollectionUtils.isNotEmpty(mobileUsers) && !oldUser.getMobile().equals(mobil)) { if (CollectionUtils.isNotEmpty(mobileUsers) && !oldUser.getMobile().equals(mobil)) {
return AccountEnum.ACCOUNT_MODIFY_STATUS_MOBILE_EXISTS.getType(); return AccountEnum.ACCOUNT_MODIFY_STATUS_MOBILE_EXISTS.getType();

@ -12,7 +12,7 @@
</select> </select>
<select id="selectAccountIdByRoleAndSearchContent" resultType="com.kiisoo.ic.system.bean.AccountBean"> <select id="selectAccountIdByRoleAndSearchContent" resultType="com.kiisoo.ic.system.bean.AccountBean">
select t1.id as accountId,t1.login as account,t2.id as userId,t5.staff_code as staffCode,t2.name as userName,t2.abbreviation,t4.name as roleName,t4.id as roleId,t1.password,t6.id as shopId,t10.name as companyName,t10.code as companyCode,t6.name as shopName,t6.code as shopCode,t4.code as roleCode,t9.id as orgId,t2.mobile select t1.id as accountId,t1.login as account,t2.id as userId,t5.staff_code as staffCode,t2.name as userName,t2.abbreviation,t4.name as roleName,t4.id as roleId,t1.password,t6.id as shopId,t10.name as companyName,t10.code as companyCode,t6.name as shopName,t6.code as shopCode,t4.code as roleCode,t9.id as orgId,t2.mobil
from privilage_account t1 from privilage_account t1
join privilage_user t2 on t1.user_id = t2.id and t1.type = 1 join privilage_user t2 on t1.user_id = t2.id and t1.type = 1
join privilage_user_role t3 on t2.id = t3.user_id join privilage_user_role t3 on t2.id = t3.user_id

@ -3,7 +3,7 @@
<mapper namespace="com.kiisoo.ic.system.mapper.PrivilageUserDOMapper"> <mapper namespace="com.kiisoo.ic.system.mapper.PrivilageUserDOMapper">
<select id="selectUserInfoAndRoleInfo" resultType="com.kiisoo.ic.system.bean.PrivilageUserBean"> <select id="selectUserInfoAndRoleInfo" resultType="com.kiisoo.ic.system.bean.PrivilageUserBean">
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 from privilage_user t1, privilage_user_role t2, privilage_role t3
where t1.id = t2.user_id where t1.id = t2.user_id
and t2.role_id = t3.id and t2.role_id = t3.id

@ -11,7 +11,7 @@
</select> </select>
<select id="selectSellersByShopIds" resultType="com.kiisoo.ic.store.bean.PoiStoreStaffDTO"> <select id="selectSellersByShopIds" resultType="com.kiisoo.ic.store.bean.PoiStoreStaffDTO">
select select
t2.id, t2.name, t2.mobile, t2.email, t2.address, t2.remark, t2.status,t1.id as staffId,t1.staff_code t2.id, t2.name, t2.mobil, t2.email, t2.address, t2.remark, t2.status,t1.id as staffId,t1.staff_code
from poi_store_staff t1, privilage_user t2 from poi_store_staff t1, privilage_user t2
where t1.user_id = t2.id and where t1.user_id = t2.id and
<choose> <choose>

Loading…
Cancel
Save