From 73acd2a65a5dbab4573ef2a93a258c0da177bcd3 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 17 十一月 2022 11:58:38 +0800
Subject: [PATCH] 普达物业公司权限处理
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 46 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 36 insertions(+), 10 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 0271801..702f050 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
@@ -371,6 +371,13 @@
loginUserInfoVO.setIsDpcMember(1);
}
}
+ //是否为物业公司账号
+ if (nonNull(sysUserDO.getPhone())){
+ Long propertyAccount = userDao.isPropertyAccount(sysUserDO.getPhone());
+ if (nonNull(propertyAccount)){
+ loginUserInfoVO.setPropertyId(propertyAccount);
+ }
+ }
return R.ok(loginUserInfoVO);
}
@@ -523,6 +530,13 @@
int i = userDao.isDpcMember(phone, sysUserDO.getName());
if (i>0){
loginUserInfoVO.setIsDpcMember(1);
+ }
+ }
+ //是否为物业公司账号
+ if (nonNull(sysUserDO.getPhone())){
+ Long propertyAccount = userDao.isPropertyAccount(sysUserDO.getPhone());
+ if (nonNull(propertyAccount)){
+ loginUserInfoVO.setPropertyId(propertyAccount);
}
}
return R.ok(loginUserInfoVO);
@@ -1321,6 +1335,7 @@
@Override
public R addUserBackstageProperty(AdministratorsUserVO administratorsUserVO) {
SysUserDO sysUserDO = new SysUserDO();
+ String appId=userDao.getCommunityAppId(administratorsUserVO.getCommunityId());
Long roleId = administratorsUserVO.getRoleId();
if (roleId.intValue() == 777777777) {
SysRoleDO sysRoleDO = new SysRoleDO();
@@ -1344,7 +1359,6 @@
menu.add(300L);
menu.add(303L);
}
-
sysRoleDO.setRoleSort(0);
sysRoleDO.setCreateBy(administratorsUserVO.getUserId());
SysRoleDO sysRoleDO1 = roleDAO.selectOne(
@@ -1361,9 +1375,8 @@
this.putMenuRole(menuRoleVO);
}
}
- if (administratorsUserVO.getType().equals(20)){
- roleId=1559112102373756548L;
- }
+ log.info("======================type"+administratorsUserVO.getType());
+ log.info("=======================roleId"+roleId);
SysRoleDO roleDO = roleDAO.selectById(roleId);
if (ObjectUtils.isEmpty(roleDO)) {
return R.fail("角色不存在");
@@ -1371,6 +1384,7 @@
String encode = new BCryptPasswordEncoder().encode(administratorsUserVO.getPassword());
administratorsUserVO.setPassword(encode);
BeanUtils.copyProperties(administratorsUserVO, sysUserDO);
+ sysUserDO.setAppId(appId);
int insert = 0;
try {
insert = userDao.insert(sysUserDO);
@@ -1384,7 +1398,6 @@
} else if (e.getMessage().contains("23000")) {
throw new ServiceException("手机号已存在");
}
-
}
if (insert > 0) {
SysUserDO sysUserDO1 = userDao
@@ -3962,17 +3975,30 @@
@Override
public R feedBackReply(SysUserFeedbackVO sysUserFeedbackVO) {
- SysUserFeedbackDO sysUserFeedbackDO=new SysUserFeedbackDO();
- BeanUtils.copyProperties(sysUserFeedbackVO, sysUserFeedbackDO);
- return R.ok(sysUserFeedbackDAO.updateById(sysUserFeedbackDO));
+ if (isNull(sysUserFeedbackVO.getReply())){
+ return R.fail("回复内容不能为空");
+ }
+ SysUserFeedbackDO sysUserFeedbackDO1 = sysUserFeedbackDAO.selectById(sysUserFeedbackVO.getId());
+ sysUserFeedbackDO1.setReply(sysUserFeedbackVO.getReply());
+ return R.ok(sysUserFeedbackDAO.reply(sysUserFeedbackDO1));
}
@Override
- public R myFeedBack(Long id,Integer type) {
- List<SysUserFeedbackDO> sysUserFeedbackDOS = sysUserFeedbackDAO.selectList(new QueryWrapper<SysUserFeedbackDO>().lambda().eq(SysUserFeedbackDO::getType, type).eq(SysUserFeedbackDO::getUserId, id));
+ public R myFeedBack(Long id,Integer type,Long propertyId) {
+ List<SysUserFeedbackDO> sysUserFeedbackDOS = sysUserFeedbackDAO.selectList(new QueryWrapper<SysUserFeedbackDO>().lambda().eq(SysUserFeedbackDO::getType, type).eq(SysUserFeedbackDO::getUserId, id).eq(SysUserFeedbackDO::getPropertyId,propertyId ));
return R.ok(sysUserFeedbackDOS);
}
+ @Override
+ public R propertyCheck(String phone) {
+ Long propertyAccount = userDao.isPropertyAccount(phone);
+ log.info("==============物业公司id"+propertyAccount);
+ if (isNull(propertyAccount)){
+ return R.fail();
+ }
+ return R.ok(propertyAccount);
+ }
+
@Override
public R getAreaAndStreet() {
--
Gitblit v1.7.1