From b95d52d48ddabdba4bd834e63035dad1253b7a30 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 17 十一月 2022 13:52:08 +0800
Subject: [PATCH] 普达物业公司权限处理
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 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 608245b..198282f 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
@@ -1358,7 +1358,6 @@
menu.add(300L);
menu.add(303L);
}
-
sysRoleDO.setRoleSort(0);
sysRoleDO.setCreateBy(administratorsUserVO.getUserId());
SysRoleDO sysRoleDO1 = roleDAO.selectOne(
@@ -1376,10 +1375,6 @@
}
}
log.info("======================type"+administratorsUserVO.getType());
- if (administratorsUserVO.getType().equals(20)){
- roleId=1559112102373756548L;
- administratorsUserVO.setType(3);
- }
log.info("=======================roleId"+roleId);
SysRoleDO roleDO = roleDAO.selectById(roleId);
if (ObjectUtils.isEmpty(roleDO)) {
@@ -1388,6 +1383,9 @@
String encode = new BCryptPasswordEncoder().encode(administratorsUserVO.getPassword());
administratorsUserVO.setPassword(encode);
BeanUtils.copyProperties(administratorsUserVO, sysUserDO);
+ if (nonNull(administratorsUserVO.getAppid())){
+ sysUserDO.setAppId(administratorsUserVO.getAppid());
+ }
int insert = 0;
try {
insert = userDao.insert(sysUserDO);
@@ -2871,7 +2869,8 @@
@Transactional(rollbackFor = Exception.class)
public R addConvenientMerchantUser(ConvenientMerchantDTO convenientMerchantDTO) {
SysUserDO sysUserDO;
- sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getAccount, convenientMerchantDTO.getAccount()));
+ sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getAccount, convenientMerchantDTO.getAccount())
+ .eq(SysUserDO::getPhone,convenientMerchantDTO.getMobilePhone()).eq(SysUserDO::getAppId,"wx118de8a734d269f0"));
if (nonNull(sysUserDO)) {
return R.fail("账户已经存在");
}
@@ -2880,10 +2879,10 @@
String encode = new BCryptPasswordEncoder().encode(convenientMerchantDTO.getPassword());
BeanUtils.copyProperties(convenientMerchantDTO, sysUserDO);
sysUserDO.setAccount(convenientMerchantDTO.getAccount());
- sysUserDO.setType(10);
+ sysUserDO.setType(5);
sysUserDO.setAreaId(null);
sysUserDO.setStatus(1);
- sysUserDO.setPhone(null);
+ sysUserDO.setPhone(convenientMerchantDTO.getMobilePhone());
sysUserDO.setName(convenientMerchantDTO.getContacts());
sysUserDO.setPassword(encode);
try {
@@ -3977,14 +3976,17 @@
@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);
}
--
Gitblit v1.7.1