|
@@ -96,9 +96,9 @@ public class CzrkServiceImpl implements ICzrkService {
|
|
public List<Czrk> listByRlry(Czrk czrk) {
|
|
public List<Czrk> listByRlry(Czrk czrk) {
|
|
log.info("{}于{}查询常住人员列表,查询条件:{}"
|
|
log.info("{}于{}查询常住人员列表,查询条件:{}"
|
|
, AuthUtils.getLoginUser().getSysUser().getUserName(), DateUtils.dateTimeNow(), JSON.toJSONString(czrk));
|
|
, AuthUtils.getLoginUser().getSysUser().getUserName(), DateUtils.dateTimeNow(), JSON.toJSONString(czrk));
|
|
|
|
+ //设置查询列表权限
|
|
setDeptIdList(czrk);
|
|
setDeptIdList(czrk);
|
|
setAgeScope(czrk);
|
|
setAgeScope(czrk);
|
|
- Long deptId = AuthUtils.getLoginUser().getSysUser().getDeptId();
|
|
|
|
//获取到居住地的查询条件
|
|
//获取到居住地的查询条件
|
|
Long provinceId = czrk.getProvinceIdXjd();
|
|
Long provinceId = czrk.getProvinceIdXjd();
|
|
Long cityId = czrk.getCityIdXjd();
|
|
Long cityId = czrk.getCityIdXjd();
|
|
@@ -108,8 +108,25 @@ public class CzrkServiceImpl implements ICzrkService {
|
|
// 去查jzdz表
|
|
// 去查jzdz表
|
|
if (Czrk.CZ.equals(czrk.getQueryType())) {
|
|
if (Czrk.CZ.equals(czrk.getQueryType())) {
|
|
CzrkJzdz czrkJzdz = new CzrkJzdz();
|
|
CzrkJzdz czrkJzdz = new CzrkJzdz();
|
|
-
|
|
|
|
- //设置查询列表权限
|
|
|
|
|
|
+ Long deptId = AuthUtils.getLoginUser().getSysUser().getDeptId();
|
|
|
|
+ //判断是否是管理员
|
|
|
|
+ List<SysRole> roles = AuthUtils.getLoginUser().getSysUser().getRoles();
|
|
|
|
+ boolean flag = true;
|
|
|
|
+ if (isNotEmpty(roles)) {
|
|
|
|
+ for (SysRole role : roles) {
|
|
|
|
+ String roleKey = role.getRoleKey();
|
|
|
|
+ if ("admin".equals(roleKey) || "city".equals(roleKey) || "yanshi".equals(roleKey)) {
|
|
|
|
+ flag = false;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ if (deptId != null && flag){
|
|
|
|
+ //设置查询列表权限
|
|
|
|
+ List<SysDept> sysDepts = remoteDeptService.listChildrenDepts(deptId);
|
|
|
|
+ if (isNotEmpty(sysDepts)) {
|
|
|
|
+ czrkJzdz.setDeptIdList(map(sysDepts, SysDept::getId));
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
|
|
List<Czrk> czrks = null;
|
|
List<Czrk> czrks = null;
|
|
if (null == provinceId && null == cityId && null == regionId && null == villageTownsId && null == villageId) {
|
|
if (null == provinceId && null == cityId && null == regionId && null == villageTownsId && null == villageId) {
|
|
@@ -153,8 +170,6 @@ public class CzrkServiceImpl implements ICzrkService {
|
|
czrk.setIdCardList(idCardList);
|
|
czrk.setIdCardList(idCardList);
|
|
}
|
|
}
|
|
startPage();
|
|
startPage();
|
|
- //设置查询列表权限
|
|
|
|
-
|
|
|
|
List<Czrk> czrks = czrkMapper.listByRlry(czrk);
|
|
List<Czrk> czrks = czrkMapper.listByRlry(czrk);
|
|
packAddr(czrks);
|
|
packAddr(czrks);
|
|
return czrks;
|
|
return czrks;
|