From 19c0886badef2cb971b8bfd3d5eadea3cbe74bc4 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 26 Jan 2024 18:00:23 +0800
Subject: [PATCH] 区域过滤去除上饶市
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 64 ++++++++++++++++++++++++++++++-
1 files changed, 61 insertions(+), 3 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 9ca8d96..755be61 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
@@ -43,7 +43,11 @@
import org.springblade.core.tool.utils.*;
import org.springblade.modules.auth.enums.UserEnum;
import org.springblade.modules.grid.service.IGridmanService;
+import org.springblade.modules.house.entity.HouseholdEntity;
+import org.springblade.modules.house.service.IHouseholdService;
+import org.springblade.modules.property.entity.PropertyCompanyEntity;
import org.springblade.modules.property.service.IPropertyCompanyDistrictService;
+import org.springblade.modules.property.service.IPropertyCompanyService;
import org.springblade.modules.system.entity.*;
import org.springblade.modules.system.excel.UserExcel;
import org.springblade.modules.system.mapper.UserMapper;
@@ -465,23 +469,26 @@
/**
* 根据手机号查询对应账号和手机号的用户信息
+ *
* @param phoneNumber
* @return
*/
@Override
public List<User> getUserListByPhoneOrAccount(String phoneNumber) {
- return baseMapper.getUserListByPhoneOrAccount( phoneNumber);
+ return baseMapper.getUserListByPhoneOrAccount(phoneNumber);
}
/**
* 获取用户信息
+ *
* @return
*/
@Override
public UserDetailVO getUserInfo(Long userId) {
// 根据用户id 获取用户详情信息
UserDetailVO userVO = baseMapper.getUserInfo(userId);
- if (null!=userVO){
+ if (null != userVO) {
+ // 设置机构
userVO.setPassword(null);
}
// 返回
@@ -495,7 +502,7 @@
@Override
public List<UserEntity> getUserInfoByCode(String houseCode, String type) {
- if (type.equals("1")) {
+ if (type.equals("0")) {
IGridmanService bean = SpringUtil.getBean(IGridmanService.class);
return bean.getGridManByCode(houseCode);
} else {
@@ -503,4 +510,55 @@
return bean1.getDistictUserByCode(houseCode);
}
}
+
+ @Override
+ 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;
+ }
+
+ @Override
+ public List<User> getUserInfoByPropertyId(String propertyCompanyId, String roleId) {
+ // 查询物业公司，获取物业公司的机构
+ IPropertyCompanyService bean = SpringUtil.getBean(IPropertyCompanyService.class);
+ PropertyCompanyEntity one = bean.getOne(Wrappers.<PropertyCompanyEntity>lambdaQuery().eq(PropertyCompanyEntity::getId, propertyCompanyId));
+ return baseMapper.getUserInfoByPropertyId(one.getDeptId().toString(), roleId);
+ }
+
+ @Override
+ public Object handleUser() {
+ List<User> list = list(Wrappers.<User>lambdaQuery()
+ .eq(User::getDeptId, "1727979636479037441")
+ .eq(User::getRoleId, "1717429059648606209"));
+ IHouseholdService bean = SpringUtil.getBean(IHouseholdService.class);
+ int a = 0;
+ for (User user : list) {
+ System.out.println("查詢處理啊的人：" + user.getId());
+ HouseholdEntity one = bean.getOne(Wrappers.<HouseholdEntity>lambdaQuery()
+ .eq(HouseholdEntity::getAssociatedUserId, user.getId())
+ .eq(HouseholdEntity::getIsDeleted, 0));
+ if (one != null) {
+ a++;
+ }
+ System.out.println("查詢處理啊的人：" + a);
+ }
+ return null;
+ }
}
--
Gitblit v1.9.3