....
This commit is contained in:
parent
5db160ca18
commit
8884612800
|
@ -186,7 +186,7 @@ public class ResourceController {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (useIds1.contains(user.getId())) { // 区管理员
|
if (useIds1.contains(user.getId())) { // 区管理员
|
||||||
logger.info("区管理员");
|
logger.info("区管理员:" + sysDeptEntity.getDistrict());
|
||||||
SysDeptEntity finalSysDeptEntity = sysDeptEntity;
|
SysDeptEntity finalSysDeptEntity = sysDeptEntity;
|
||||||
List<Long> deptId = sysDeptDao.getIdFromDistrict(sysDeptEntity.getDistrict());
|
List<Long> deptId = sysDeptDao.getIdFromDistrict(sysDeptEntity.getDistrict());
|
||||||
List<Long> temp = new ArrayList<Long>() {
|
List<Long> temp = new ArrayList<Long>() {
|
||||||
|
@ -214,8 +214,8 @@ public class ResourceController {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
PageData<ResourceDTO> page = resourceService.page(params);
|
PageData<ResourceDTO> page = resourceService.page(params);
|
||||||
|
|
|
@ -563,7 +563,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
|
||||||
}
|
}
|
||||||
|
|
||||||
if (useIds1.contains(user.getId())) { // 区管理员
|
if (useIds1.contains(user.getId())) { // 区管理员
|
||||||
logger.info("区管理员");
|
logger.info("区管理员" + sysDeptEntity.getDistrict());
|
||||||
SysDeptEntity finalSysDeptEntity = sysDeptEntity;
|
SysDeptEntity finalSysDeptEntity = sysDeptEntity;
|
||||||
List<Long> deptId = sysDeptDao.getIdFromDistrict(sysDeptEntity.getDistrict());
|
List<Long> deptId = sysDeptDao.getIdFromDistrict(sysDeptEntity.getDistrict());
|
||||||
List<Long> temp = new ArrayList<Long>() {
|
List<Long> temp = new ArrayList<Long>() {
|
||||||
|
@ -599,6 +599,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
Boolean nonChinese = jsonObject.containsKey("nonChinese") ? jsonObject.getBoolean("nonChinese") : Boolean.FALSE; // 不传默认为中文走全文索引
|
Boolean nonChinese = jsonObject.containsKey("nonChinese") ? jsonObject.getBoolean("nonChinese") : Boolean.FALSE; // 不传默认为中文走全文索引
|
||||||
|
|
Loading…
Reference in New Issue