chenrj-PC\chenrj 8 lat temu
rodzic
commit
64c4821e2e

+ 19 - 0
VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/StatisticsServiceImpl.java

@@ -528,7 +528,11 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 		if (obj.getQueryType() != null && obj.getQueryType() == 1) {
 			// 检索当前导管中心下的deptid
 			Organ organ = new Organ();
+			if(obj.getDept_id()==null){
+				return null ;
+			}
 			organ.setParentid(obj.getDept_id().intValue());
+			
 			List<Organ> list = departmentDao.getOrgan(organ);
 			// 将导管中心下的收费站部门id 列表放入到list中
 			obj.setDept_list(list);
@@ -628,6 +632,9 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 			}
 		}
 		Organ organ = new Organ();
+		if(obj.getDept_id()==null){
+			return null ;
+		}
 		organ.setParentid(obj.getDept_id().intValue());
 		List<Organ> list = departmentDao.getOrgan(organ);
 
@@ -739,6 +746,9 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 		} else if (obj.getQueryType() == 1) {
 			// 道管中心
 			Organ organ = new Organ();
+			if(obj.getDept_id()==null){
+				return null ;
+			}
 			organ.setParentid(obj.getDept_id().intValue());
 			List<Organ> list = departmentDao.getOrgan(organ);
 			// 将导管中心下的收费站部门id 列表放入到list中
@@ -778,6 +788,9 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 		if (obj.getQueryType() == 1) {
 			// 道管中心
 			Organ organ = new Organ();
+			if(obj.getDept_id()==null){
+				return null ;
+			}
 			organ.setParentid(obj.getDept_id().intValue());
 			List<Organ> list = departmentDao.getOrgan(organ);
 			// 将导管中心下的收费站部门id 列表放入到list中
@@ -807,6 +820,9 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 		} else if (obj.getQueryType() == 1) {
 			// 道管中心
 			Organ organ = new Organ();
+			if(obj.getDept_id()==null){
+				return null ;
+			}
 			organ.setParentid(obj.getDept_id().intValue());
 			List<Organ> list = departmentDao.getOrgan(organ);
 			// 将导管中心下的收费站部门id 列表放入到list中
@@ -855,6 +871,9 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 		if (obj.getQueryType() == 1) {
 			// 道管中心
 			Organ organ = new Organ();
+			if(obj.getDept_id()==null){
+				return null ;
+			}
 			organ.setParentid(obj.getDept_id().intValue());
 			List<Organ> list = departmentDao.getOrgan(organ);
 			// 将导管中心下的收费站部门id 列表放入到list中