From 9e033f3843e49197dbe5e0288b4e492eaec1cd08 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Fri, 01 Mar 2024 17:03:45 +0800
Subject: [PATCH] 新增部門報錯
---
src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
index 3127d74..8da01be 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
@@ -255,7 +255,7 @@
dept.setId(one.getId());
flag = updateById(dept);
} else {
- if (dept.getId() > 0) {
+ if (dept.getId() != null && dept.getId() > 0) {
flag = updateById(dept);
} else {
flag = save(dept);
@@ -324,7 +324,7 @@
public Object dataHandle() {
// 查询所有的社区
QueryWrapper<Region> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("district_code","361102").eq("region_level",5);
+ queryWrapper.eq("district_code", "361102").eq("region_level", 5);
List<Region> list = regionService.list(queryWrapper);
// 遍历
for (Region region : list) {
@@ -343,7 +343,7 @@
QueryWrapper<Dept> deptQueryWrapper = new QueryWrapper<>();
deptQueryWrapper.eq("is_deleted", 0).eq("dept_name", region.getTownName());
Dept parentDept = getOne(deptQueryWrapper);
- if (null!=parentDept){
+ if (null != parentDept) {
dept.setParentId(parentDept.getId());
dept.setAncestors(parentDept.getAncestors() + "," + parentDept.getId());
}
@@ -365,7 +365,7 @@
public Object dataHandleCommunity() {
// 查询所有的社区
QueryWrapper<Region> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("district_code","361102").eq("region_level",5);
+ queryWrapper.eq("district_code", "361102").eq("region_level", 5);
List<Region> list = regionService.list(queryWrapper);
// 遍历
for (Region region : list) {
@@ -426,11 +426,11 @@
String deptIds = "";
int count = 0;
- for (String key:deptMap.keySet()){
+ for (String key : deptMap.keySet()) {
count++;
deptIds += key;
- if (count<deptMap.size()){
- deptIds +=",";
+ if (count < deptMap.size()) {
+ deptIds += ",";
}
}
@@ -448,13 +448,13 @@
public Object dataHandleCommunityByPolice() {
// 查询所有的派出所
QueryWrapper<Dept> wrapper = new QueryWrapper<>();
- wrapper.eq("is_deleted",0).like("dept_name","派出所");
+ wrapper.eq("is_deleted", 0).like("dept_name", "派出所");
List<Dept> list = list(wrapper);
// 遍历
for (Dept dept : list) {
// 通过派出所名称查询对应的警务网格信息
QueryWrapper<PoliceAffairsGridEntity> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("is_deleted",0).eq("pcs_name",dept.getDeptName());
+ queryWrapper.eq("is_deleted", 0).eq("pcs_name", dept.getDeptName());
List<PoliceAffairsGridEntity> policeAffairsGridEntityList
= SpringUtil.getBean(IPoliceAffairsGridService.class).list(queryWrapper);
// 遍历
@@ -477,6 +477,7 @@
/**
* 查询对应的派出所
+ *
* @param deptId
* @return
*/
--
Gitblit v1.9.3