From 566e7986291e73051d30ee252b0ebf852b1577a7 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 02 Apr 2024 14:25:51 +0800
Subject: [PATCH] 娱乐场所标签新增180200
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 28 +++++++++-------------------
1 files changed, 9 insertions(+), 19 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 d553a18..80adbba 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
@@ -50,9 +50,11 @@
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.house.vo.HouseholdVO;
import org.springblade.modules.police.entity.PoliceAffairsGridEntity;
import org.springblade.modules.police.service.IPoliceAffairsGridService;
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.PoliceUserExcel;
@@ -602,11 +604,12 @@
IGridmanService bean = SpringUtil.getBean(IGridmanService.class);
return bean.getGridManByCode(houseCode);
} else {
-// IPropertyCompanyDistrictService bean1 = SpringUtil.getBean(IPropertyCompanyDistrictService.class);
-// return bean1.getDistictUserByCode(houseCode);
- String deptId = AuthUtil.getDeptId();
- List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
- return baseMapper.selectUserByDept(deptIdList);
+ IPropertyCompanyDistrictService bean1 = SpringUtil.getBean(IPropertyCompanyDistrictService.class);
+ return bean1.getDistictUserByCode(houseCode);
+ // 通过huosecode 查询物业工作人员
+// String deptId = AuthUtil.getDeptId();
+// List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
+// return baseMapper.selectUserByDept(deptIdList);
}
}
@@ -622,20 +625,7 @@
return baseMapper.getUserInfoByDistrictId(districtId, building);
}
- /**
- * 通过小区id查询用户
- *
- * @param districtIds
- * @param building
- * @param unit
- * @param name
- * @return
- */
- @Override
- public IPage<User> getUserInfoByDistrictIds(String districtIds, String building, String unit, String name, IPage<User> page) {
- List<String> list = JSON.parseArray(districtIds).toJavaList(String.class);
- return page.setRecords(baseMapper.getUserInfoByDistrictIds(list, building, unit, name, page));
- }
+
/**
* 处理漏绑定的user_dept
--
Gitblit v1.9.3