From 8d493a008ce655963f0363b116d5b55e02eff3d6 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期三, 16 十一月 2022 09:45:13 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into zigonggao_dev
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 15fc6e5..bf053fa 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
@@ -1335,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();
@@ -1376,10 +1377,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 +1385,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);
@@ -1410,6 +1408,9 @@
SysUserRoleDO sysUserRoleDO = new SysUserRoleDO();
sysUserRoleDO.setUserId(userId);
sysUserRoleDO.setRoleId(roleDO.getRoleId());
+ if (sysUserDO.getCommunityId().equals(10172)){
+ sysUserRoleDO.setRoleId(1559112102373756548L);
+ }
int insert1 = sysUserRoleDAO.insert(sysUserRoleDO);
if (insert1 > 0) {
return R.ok(userId);
@@ -3983,7 +3984,7 @@
}
SysUserFeedbackDO sysUserFeedbackDO1 = sysUserFeedbackDAO.selectById(sysUserFeedbackVO.getId());
sysUserFeedbackDO1.setReply(sysUserFeedbackVO.getReply());
- return R.ok(sysUserFeedbackDAO.updateById(sysUserFeedbackDO1));
+ return R.ok(sysUserFeedbackDAO.reply(sysUserFeedbackDO1));
}
@Override
--
Gitblit v1.7.1