From e67a8a7477096a295d65afa1c366d2b59f8752fc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 20 Feb 2024 14:20:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 65 +++++++++++++++++++++++++++++---
1 files changed, 59 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index 59bb6f0..1601e19 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -148,8 +148,23 @@
* @param user
*/
public void updateGridBind(User user) {
+ // 先删除原有区域的绑定
+ QueryWrapper<PoliceAffairsGridEntity> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("is_deleted",0).like("police_user_id",user.getId());
+ // 删除掉之前已绑定的
+ List<PoliceAffairsGridEntity> list = SpringUtil.getBean(IPoliceAffairsGridService.class).list(queryWrapper);
+ // 遍历
+ for (PoliceAffairsGridEntity policeAffairsGridEntity : list) {
+ List<String> arrayList = new ArrayList<>(Arrays.asList(policeAffairsGridEntity.getPoliceUserId().split(",")));
+ arrayList.remove(user.getId().toString());
+ // 更新
+ policeAffairsGridEntity.setPoliceUserId(String.join(",",arrayList));
+ // 解决更新报错
+ policeAffairsGridEntity.setGeom(null);
+ SpringUtil.getBean(IPoliceAffairsGridService.class).updateById(policeAffairsGridEntity);
+ }
// 判断机构类型
- List<String> deptIds = Arrays.asList(user.getDeptId().split(","));
+ List<String> deptIds = new ArrayList<>(Arrays.asList(user.getDeptId().split(",")));
for (String deptId : deptIds) {
// 查询对应的机构
Dept dept = SpringUtil.getBean(IDeptService.class).getById(deptId);
@@ -197,9 +212,9 @@
}
@Override
- public IPage<User> selectUserPage(IPage<User> page, User user, Long deptId, String tenantId) {
+ public IPage<User> selectUserPage(IPage<User> page, User user, String deptId, String tenantId) {
if (null == deptId && !AuthUtil.isAdministrator()) {
- deptId = Long.parseLong(AuthUtil.getDeptId());
+ deptId = AuthUtil.getDeptId();
}
List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
return page.setRecords(baseMapper.selectUserPage(page, user, deptIdList, tenantId));
@@ -356,7 +371,39 @@
if (Func.contains(Func.toLongArray(userIds), AuthUtil.getUserId())) {
throw new ServiceException("不能删除本账号!");
}
- return deleteLogic(Func.toLongList(userIds));
+ boolean deleteLogic = deleteLogic(Func.toLongList(userIds));
+ if (deleteLogic){
+ // 删除警格绑定
+ removePoliceGridBind(userIds);
+ }
+ return deleteLogic;
+ }
+
+ /**
+ * 删除警格绑定
+ * @param userIds
+ */
+ public void removePoliceGridBind(String userIds) {
+ List<String> userIdList = new ArrayList<>(Arrays.asList(userIds.split(",")));
+ for (String userId : userIdList) {
+ // 先删除原有区域的绑定
+ QueryWrapper<PoliceAffairsGridEntity> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("is_deleted",0).like("police_user_id",userId);
+ // 删除掉之前已绑定的
+ List<PoliceAffairsGridEntity> list = SpringUtil.getBean(IPoliceAffairsGridService.class).list(queryWrapper);
+ if (list.size()>0) {
+ // 遍历
+ for (PoliceAffairsGridEntity policeAffairsGridEntity : list) {
+ List<String> arrayList = new ArrayList<>(Arrays.asList(policeAffairsGridEntity.getPoliceUserId().split(",")));
+ arrayList.remove(userId);
+ // 更新
+ policeAffairsGridEntity.setPoliceUserId(String.join(",", arrayList));
+ // 解决更新报错
+ policeAffairsGridEntity.setGeom(null);
+ SpringUtil.getBean(IPoliceAffairsGridService.class).updateById(policeAffairsGridEntity);
+ }
+ }
+ }
}
@Override
@@ -701,8 +748,14 @@
list.remove(deptPcs.getId().toString());
user.setDeptId(String.join(",",list));
}
- if (!user.getDeptId().contains(dept.getId().toString())) {
- user.setDeptId(user.getDeptId() + "," + dept.getId());
+ // 删完后可能就没了
+ if (!Strings.isBlank(user.getDeptId())) {
+ if (!user.getDeptId().contains(dept.getId().toString())) {
+ user.setDeptId(user.getDeptId() + "," + dept.getId());
+ }
+ }else {
+ // 删完后的
+ user.setDeptId(dept.getId().toString());
}
}else {
if (!user.getDeptId().contains(dept.getId().toString())) {
--
Gitblit v1.9.3