From 0a4aee700a60c4b28248f3d1a7f4f91376b68492 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 01 八月 2022 14:46:47 +0800
Subject: [PATCH] Merge branch 'haucheng_panzhihua' into shuangzheng2
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 64 ++++++-------------------------
1 files changed, 13 insertions(+), 51 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 546b86e..bcece4d 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
@@ -109,6 +109,7 @@
import cn.hutool.core.util.IdcardUtil;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestParam;
// import com.panzhihua.common.service.grid.GridService;
@@ -304,7 +305,7 @@
* @return 用户基本信息、角色
*/
@Override
- public R<LoginUserInfoVO> getUserInfo(String name, int type) {
+ public R<LoginUserInfoVO> getUserInfo(String name, int type,String appId) {
SysUserDO sysUserDO = null;
if (1 == type) {
sysUserDO = userDao.selectOne(
@@ -313,9 +314,9 @@
LambdaQueryWrapper<SysUserDO> wrapper = new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getType, type);
if (type == 11) {
//只允许通过account登录
- wrapper.and(sysUserDOLambdaQueryWrapper -> sysUserDOLambdaQueryWrapper.eq(SysUserDO::getAccount, name));
+ wrapper.and(sysUserDOLambdaQueryWrapper -> sysUserDOLambdaQueryWrapper.eq(SysUserDO::getAccount, name).eq(SysUserDO::getAppId,appId));
} else {
- wrapper.and(sysUserDOLambdaQueryWrapper -> sysUserDOLambdaQueryWrapper.eq(SysUserDO::getAccount, name).or()
+ wrapper.and(sysUserDOLambdaQueryWrapper -> sysUserDOLambdaQueryWrapper.eq(SysUserDO::getAppId,appId).eq(SysUserDO::getAccount, name).or()
.eq(SysUserDO::getPhone, name));
}
sysUserDO = userDao.selectOne(wrapper);
@@ -341,11 +342,11 @@
if(StringUtils.isNotEmpty(areaName)){
loginUserInfoVO.setAreaName(areaName);
}
- SysAppConfig sysAppConfig=sysAppConfigDao.selectOne(new QueryWrapper<SysAppConfig>().lambda().eq(SysAppConfig::getAreaCode,comActVO.getAreaCode()));
- if(sysAppConfig!=null){
- loginUserInfoVO.setAppId(sysAppConfig.getAppId());
- loginUserInfoVO.setAppSecret(sysAppConfig.getSecret());
- }
+// SysAppConfig sysAppConfig=sysAppConfigDao.selectOne(new QueryWrapper<SysAppConfig>().lambda().eq(SysAppConfig::getAreaCode,comActVO.getAreaCode()));
+// if(sysAppConfig!=null){
+// loginUserInfoVO.setAppId(sysAppConfig.getAppId());
+// loginUserInfoVO.setAppSecret(sysAppConfig.getSecret());
+// }
}
}
List<SysRoleDO> roleDOList = roleDAO.selectByUserId(sysUserDO.getUserId());
@@ -692,12 +693,10 @@
@Override
public R<LoginUserInfoVO> detailUser(Long userId) {
LoginUserInfoVO loginUserInfoVO = new LoginUserInfoVO();
- if (userId < 100000000l) {
SysUserDO sysUserDO = userDao.selectById(userId);
if (ObjectUtils.isEmpty(sysUserDO)) {
return R.fail("人员不存在");
}
-
BeanUtils.copyProperties(sysUserDO, loginUserInfoVO);
List<ComMngFamilyInfoDO> comMngFamilyInfoDOS = comMngFamilyInfoDAO
.selectList(new QueryWrapper<ComMngFamilyInfoDO>().lambda().eq(ComMngFamilyInfoDO::getUserId, userId));
@@ -710,43 +709,6 @@
});
loginUserInfoVO.setComMngFamilyInfoVOS(comMngFamilyInfoVOS);
}
-
- } else {
- // 导入社区人员
- SysUserInputDO sysUserInputDO = sysUserInputDAO.selectById(userId - 100000000);
- if (ObjectUtils.isEmpty(sysUserInputDO)) {
- return R.fail("人员不存在");
- }
- String name1 = sysUserInputDO.getName();
- BeanUtils.copyProperties(sysUserInputDO, loginUserInfoVO);
- String doorNumber = sysUserInputDO.getDoorNumber();
- Long areaId = sysUserInputDO.getAreaId();
- List<SysUserInputDO> sysUserInputDOS = sysUserInputDAO.selectList(new QueryWrapper<SysUserInputDO>()
- .lambda().eq(SysUserInputDO::getDoorNumber, doorNumber).eq(SysUserInputDO::getAreaId, areaId));
- if (!ObjectUtils.isEmpty(sysUserInputDOS)) {
- List<ComMngFamilyInfoVO> comMngFamilyInfoVOS = new ArrayList<>();
- sysUserInputDOS.forEach(sysUserInputDO1 -> {
- String name = sysUserInputDO1.getName();
- if (name1.equals(name)) {
- return;
- }
- Integer isRent = sysUserInputDO1.getIsRent();
- ComMngFamilyInfoVO comMngFamilyInfoVO = new ComMngFamilyInfoVO();
- comMngFamilyInfoVO.setIdCard(SensitiveUtil.desensitizedIdNumber(sysUserInputDO1.getIdCard()));
- comMngFamilyInfoVO.setName(name);
- comMngFamilyInfoVO.setPhone(SensitiveUtil.desensitizedPhoneNumber(sysUserInputDO1.getPhone()));
- if (isRent.intValue() == 0) {
- comMngFamilyInfoVO.setRelationship("家人");
- } else {
- comMngFamilyInfoVO.setRelationship("合租");
- }
- comMngFamilyInfoVO.setAge(IdCard.IdNOToAge(sysUserInputDO1.getIdCard()));
- comMngFamilyInfoVOS.add(comMngFamilyInfoVO);
- });
- loginUserInfoVO.setComMngFamilyInfoVOS(comMngFamilyInfoVOS);
- }
-
- }
ComActVO comActVO = userDao.selectCommunity(loginUserInfoVO.getCommunityId());
if (!ObjectUtils.isEmpty(comActVO)) {
String areaName=userDao.selectAreaCodeByStreetId(comActVO.getStreetId());
@@ -1757,9 +1719,9 @@
* @return 协议内容
*/
@Override
- public R userAgreement(int type) {
+ public R userAgreement(int type,String appId) {
SysUserAgreementDO sysUserAgreementDO = sysUserAgreementDAO
- .selectOne(new QueryWrapper<SysUserAgreementDO>().lambda().eq(SysUserAgreementDO::getType, type));
+ .selectOne(new QueryWrapper<SysUserAgreementDO>().lambda().eq(SysUserAgreementDO::getType, type).eq(SysUserAgreementDO::getAppId,appId));
return R.ok(sysUserAgreementDO);
}
@@ -2078,9 +2040,9 @@
* @return 协议内容
*/
@Override
- public R agreement(Integer type) {
+ public R agreement(Integer type,String appId) {
SysUserAgreementDO sysUserAgreementDO = sysUserAgreementDAO
- .selectOne(new QueryWrapper<SysUserAgreementDO>().lambda().eq(SysUserAgreementDO::getType, type));
+ .selectOne(new QueryWrapper<SysUserAgreementDO>().lambda().eq(SysUserAgreementDO::getType, type).eq(SysUserAgreementDO::getAppId,appId));
if (ObjectUtils.isEmpty(sysUserAgreementDO)) {
return R.fail("协议不存在");
}
--
Gitblit v1.7.1