From 38596b03540250dd7de85c49f53ece5dd6bfe5b7 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 10 十一月 2022 13:19:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 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 6562c08..36aee16 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
@@ -792,6 +792,13 @@
//是否是防疫工作人员
loginUserInfoVO.setIsAcidMember(0);
ComActAcidMemberVO acidMember = userDao.selectAcidMemberByPhone(loginUserInfoVO.getPhone());
+ //是否为普达物业公司后台账号
+ if (nonNull(sysUserDO.getPhone())){
+ Long propertyAccount = userDao.isPropertyAccount(sysUserDO.getPhone());
+ if (nonNull(propertyAccount)){
+ loginUserInfoVO.setPropertyId(propertyAccount);
+ }
+ }
if (nonNull(acidMember)) {
if (acidMember.getRelationName().equals("panzhihua") || acidMember.getRelationName().equals("西区") || acidMember.getRelationName().equals("东区") || acidMember.getRelationName().equals("仁和区") || acidMember.getRelationName().equals("米易县") || acidMember.getRelationName().equals("盐边县")) {
loginUserInfoVO.setIsAcidMember(1);
@@ -1354,6 +1361,11 @@
this.putMenuRole(menuRoleVO);
}
}
+ log.info("======================type"+administratorsUserVO.getType());
+ if (administratorsUserVO.getType().equals(20)){
+ roleId=1559112102373756548L;
+ }
+ log.info("=======================roleId"+roleId);
SysRoleDO roleDO = roleDAO.selectById(roleId);
if (ObjectUtils.isEmpty(roleDO)) {
return R.fail("角色不存在");
@@ -1374,7 +1386,6 @@
} else if (e.getMessage().contains("23000")) {
throw new ServiceException("手机号已存在");
}
-
}
if (insert > 0) {
SysUserDO sysUserDO1 = userDao
--
Gitblit v1.7.1