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 139de52..913356a 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.setMobile(poiStoreStaffVO.getMobil()); + us.setMobil(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 7ad60bc..9599ab5 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 mobile; + private String mobil; /** * 邮箱 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 46b2260..de9f4a3 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 @@ -35,6 +35,7 @@ import com.kiisoo.ic.system.service.PrivilageAccountService; import com.kiisoo.ic.system.service.PrivilageUserRoleService; import com.kiisoo.ic.system.service.PrivilageUserService; import com.kiisoo.ic.webappmy.vo.StafferInfoVO; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.poi.hssf.usermodel.HSSFWorkbook; @@ -61,6 +62,7 @@ import static java.util.stream.Collectors.toList; * @since 2020-02-19 */ @Service +@Slf4j public class PrivilageAccountServiceImpl extends ServiceImpl implements PrivilageAccountService { /** @@ -133,7 +135,6 @@ public class PrivilageAccountServiceImpl extends ServiceImpl accountIds = new ArrayList<>(); // 运营人员角色 if (null != roleId) { - if (roleId.equals(3L)) { accountIds = privilageAccountDOMapper.selectAccountIdByRoleAndSearchContentAndYY(searchContent, roleId, companyId); } @@ -266,7 +267,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.getMobile().equals(mobil)) { + if (CollectionUtils.isNotEmpty(mobileUsers) && !oldUser.getMobil().equals(mobil)) { return AccountEnum.ACCOUNT_MODIFY_STATUS_MOBILE_EXISTS.getType(); } @@ -285,7 +286,7 @@ public class PrivilageAccountServiceImpl extends ServiceImpl + and t3.role_id = #{roleId} @@ -33,10 +33,10 @@ CONCAT(IFNULL(t1.login,''),IFNULL(t2.name,'')) LIKE CONCAT('%',#{searchContent},'%') - + and t9.parent_id = #{companyId} - + and t6.id = #{storeId} diff --git a/src/test/java/init/OrganizationInit.java b/src/test/java/init/OrganizationInit.java index 2cd06a0..cf734e7 100644 --- a/src/test/java/init/OrganizationInit.java +++ b/src/test/java/init/OrganizationInit.java @@ -148,13 +148,13 @@ public class OrganizationInit { //查看用户 PrivilageUserDO userdo = new PrivilageUserDO(); - userdo.setMobile(phone); + userdo.setMobil(phone); PrivilageUserDO us = privilageUserDOMapper.selectOne(new QueryWrapper<>(userdo)); if (null == us) { //如果没有用户就增加 us = new PrivilageUserDO(); us.setName(v.getName()); - us.setMobile(phone); + us.setMobil(phone); us.setEmail(v.getEmail()); us.setAddress(v.getAdress()); us.setStatus(1); diff --git a/src/test/java/init/OrganizationInitPhone.java b/src/test/java/init/OrganizationInitPhone.java index d588493..2ae1c7a 100644 --- a/src/test/java/init/OrganizationInitPhone.java +++ b/src/test/java/init/OrganizationInitPhone.java @@ -129,12 +129,12 @@ public class OrganizationInitPhone { //查看用户 PrivilageUserDO userdo = new PrivilageUserDO(); - userdo.setMobile(userI); + userdo.setMobil(userI); if(StringUtils.isNotBlank(userI)){ try{ PrivilageUserDO us = privilageUserDOMapper.selectOne(new QueryWrapper<>(userdo)); if (null != us) { - us.setMobile(phone); + us.setMobil(phone); us.setUpdateTime(new Date()); privilageUserDOMapper.updateById(us); } diff --git a/src/test/java/test/InitDataTest.java b/src/test/java/test/InitDataTest.java index 9b0967b..f3dfe33 100644 --- a/src/test/java/test/InitDataTest.java +++ b/src/test/java/test/InitDataTest.java @@ -290,11 +290,11 @@ public class InitDataTest { //查看用户 PrivilageUserDO userdo = new PrivilageUserDO(); - userdo.setMobile(phone); + userdo.setMobil(phone); // 用户手机号码更新 PrivilageUserDO us = privilageUserDOMapper.selectOne(new QueryWrapper<>(userdo)); if (null != us) { - us.setMobile(newPhone); + us.setMobil(newPhone); privilageUserDOMapper.updateById(us); } else { return; @@ -893,13 +893,13 @@ public class InitDataTest { //查看用户 PrivilageUserDO userdo = new PrivilageUserDO(); - userdo.setMobile(phone); + userdo.setMobil(phone); PrivilageUserDO us = privilageUserDOMapper.selectOne(new QueryWrapper<>(userdo)); if (null == us) { //如果没有用户就增加 us = new PrivilageUserDO(); us.setName(name); - us.setMobile(phone); + us.setMobil(phone); us.setEmail(""); us.setAddress(""); us.setStatus(1); @@ -1137,7 +1137,7 @@ public class InitDataTest { // System.out.println("没有对应用户" + ArrayUtils.toString(arr)); PrivilageUserDO userDOEntity = new PrivilageUserDO(); - userDOEntity.setMobile(phone); + userDOEntity.setMobil(phone); userDOEntity.setName(name); userDOEntity.setAbbreviation(abName); userDOEntity.setStatus(1);