From 2f5f60384a5f469787edbe333aaa265fae58bf2d Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 28 Nov 2023 17:21:27 +0800
Subject: [PATCH] 网格，网格员相关修改
---
src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java b/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
index ab844dc..48a3538 100644
--- a/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
+++ b/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
@@ -158,19 +158,29 @@
userParams.setPhone(placeVO.getPhone());
User user = userService.getOne(Condition.getQueryWrapper(userParams));
- if (user != null) {
+ if (null!=user) {
//如果用户存在，则该用户id绑定场所
placeVO.setPrincipalUserId(user.getId());
newUser = user;
+ // 判断用户是否包含了居民角色,不包含则需更新
+ if (!user.getRoleId().contains("1717429059648606209")){
+ user.setRoleId(user.getRoleId() + ",1717429059648606209");
+ //更新
+ userService.updateById(user);
+ }
} else {
//如果用户不存在，则新增一个用户
newUser.setAccount(placeVO.getPhone());
newUser.setPhone(placeVO.getPhone());
newUser.setName(placeVO.getUsername());
newUser.setRealName(placeVO.getUsername());
- // 目前暂定居民角色，默认密码为 123456
+ // 社区群众部门
+ newUser.setDeptId("1727979636479037441");
+ // 目前暂定居民角色，
newUser.setRoleId("1717429059648606209");
+ //默认密码为 123456
newUser.setPassword("123456");
+ // 设置机构
// 用户新增
boolean submit = userService.submit(newUser);
//绑定id
--
Gitblit v1.9.3