From 7e30251d2212743dc45950bae42df674eff4cca7 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 04 Jan 2024 17:48:51 +0800
Subject: [PATCH] 用户关联数据处理
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 8 ++++++++
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 18 ++++++++++++++++++
src/main/java/org/springblade/modules/system/controller/UserController.java | 10 +++++++++-
src/main/java/org/springblade/modules/system/mapper/UserMapper.java | 6 ++++++
src/main/java/org/springblade/modules/system/service/IUserService.java | 5 +++++
5 files changed, 46 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index f4e8317..29913ec 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -397,7 +397,7 @@
/**
- * 修改
+ * 查询物业人员/网格人员
*/
@GetMapping("/getUserInfoByDistrictId")
@ApiOperation(value = "查询物业人员/网格人员", notes = "houseCode")
@@ -405,4 +405,12 @@
return R.data(userService.getUserInfoByDistrictId(districtId, building));
}
+ /**
+ * 处理漏绑定的user_dept
+ */
+ @GetMapping("/handleUserDept")
+ public R handleUserDept() {
+ return R.data(userService.handleUserDept());
+ }
+
}
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
index 374719f..6b8a42c 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
@@ -99,4 +99,10 @@
UserVO searchUserById(Long id);
List<UserEntity> getUserInfoByDistrictId(String districtId, String building);
+
+ /**
+ * 查询没有匹配的数据
+ * @return
+ */
+ List<User> getNotBindUserDept();
}
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index a6d245d..89e8605 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -176,5 +176,13 @@
</select>
+ <!--查询没有匹配的数据-->
+ <select id="getNotBindUserDept" resultType="org.springblade.modules.system.entity.User">
+ select bu.* from blade_user bu
+ left join blade_user_dept bud on bu.id = bud.user_id
+ where bu.is_deleted = 0 and bud.id is null
+ and bu.dept_id!=''
+ </select>
+
</mapper>
diff --git a/src/main/java/org/springblade/modules/system/service/IUserService.java b/src/main/java/org/springblade/modules/system/service/IUserService.java
index 7b376ff..b2259d8 100644
--- a/src/main/java/org/springblade/modules/system/service/IUserService.java
+++ b/src/main/java/org/springblade/modules/system/service/IUserService.java
@@ -247,4 +247,9 @@
List<UserEntity> getUserInfoByCode(String houseCode, String type);
List<UserEntity> getUserInfoByDistrictId(String districtId, String building);
+
+ /**
+ * 处理漏绑定的user_dept
+ */
+ Object handleUserDept();
}
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 faf733c..943275f 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
@@ -508,4 +508,22 @@
public List<UserEntity> getUserInfoByDistrictId(String districtId, String building) {
return baseMapper.getUserInfoByDistrictId(districtId, building);
}
+
+ /**
+ * 处理漏绑定的user_dept
+ */
+ @Override
+ public Object handleUserDept() {
+ // 查询没有匹配的数据
+ List<User> list = baseMapper.getNotBindUserDept();
+ // 遍历处理
+ for (User user : list) {
+ UserDept userDept = new UserDept();
+ userDept.setUserId(user.getId());
+ userDept.setDeptId(Long.parseLong(user.getDeptId()));
+ // 保存
+ userDeptService.save(userDept);
+ }
+ return null;
+ }
}
--
Gitblit v1.9.3