From d153e0f3677ed9725e13648b39d6d710ac4bdbe4 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 23 六月 2022 17:52:02 +0800
Subject: [PATCH] Merge branch 'huacheng' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
index 5794e7f..643fe21 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -408,6 +408,13 @@
}
loginUserInfoVO.setRelationName(acidMember.getRelationName());
}
+ Integer count=userDao.selectOrgAdmin(phone);
+ if(count>0){
+ loginUserInfoVO.setIsCheckUnitAdmin(1);
+ }
+ else {
+ loginUserInfoVO.setIsCheckUnitAdmin(0);
+ }
//是否网格员
int easyPhotoMember = userDao.countEasyPhotoMember(phone, userCommunityId);
if (easyPhotoMember > 0) {
@@ -2162,9 +2169,9 @@
@Override
public R getSysUserVOByPhone(String phone) {
SysUserDO sysUserDO = userDao
- .selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getPhone, phone).eq(SysUserDO::getType, 1));
+ .selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getPhone, phone).eq(SysUserDO::getType, 1).orderByDesc(SysUserDO::getCreateAt).last("limit 1"));
if (ObjectUtils.isEmpty(sysUserDO)) {
- return R.fail("用户不存在");
+ return R.fail("账号或密码错误");
}
SysUserVO sysUserVO = new SysUserVO();
BeanUtils.copyProperties(sysUserDO, sysUserVO);
@@ -2199,7 +2206,7 @@
query.eq(SysUserDO::getType, type);
SysUserDO sysUserDO = userDao.selectOne(query);
if (ObjectUtils.isEmpty(sysUserDO)) {
- return R.fail("用户不存在");
+ return R.fail("账号或密码错误");
}
SysUserVO sysUserVO = new SysUserVO();
BeanUtils.copyProperties(sysUserDO, sysUserVO);
@@ -2972,7 +2979,7 @@
public R getUserInfoByUnionId(String unionId) {
SysUserDO sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getUnionid, unionId));
if (isNull(sysUserDO)) {
- return R.fail("用户不存在");
+ return R.fail("账号或密码错误");
}
LoginUserInfoVO loginUserInfoVO = new LoginUserInfoVO();
BeanUtils.copyProperties(sysUserDO, loginUserInfoVO);
--
Gitblit v1.7.1