From b5b6b59de8f5349de1e36875582224f2712e0727 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 14 Nov 2023 10:13:27 +0800
Subject: [PATCH] chore:补充提交
---
screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
index db78fac..9b03888 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
@@ -1,8 +1,14 @@
package com.moral.api.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.moral.api.config.Interceptor.UserHelper;
+import com.moral.api.entity.MonitorPoint;
import com.moral.api.entity.Organization;
+import com.moral.api.mapper.MonitorPointMapper;
import com.moral.api.mapper.OrganizationMapper;
+import com.moral.api.pojo.vo.user.QxUser;
+import com.moral.api.service.DeviceService;
+import com.moral.api.service.MonitorPointService;
import com.moral.api.service.OrganizationService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.constant.Constants;
@@ -27,6 +33,8 @@
@Autowired
OrganizationMapper organizationMapper;
+
+
@Override
public List<Organization> getChildrenOrganizationsById(Integer id) {
List<Organization> childrenOrganization = new ArrayList<>();
@@ -35,13 +43,11 @@
}
@Override
- public Organization getStateControlStation() {
- QueryWrapper<Organization> wrapper = new QueryWrapper<>();
- wrapper.eq("name","���������");
- wrapper.eq("is_delete",Constants.NOT_DELETE);
- Organization organization = organizationMapper.selectOne(wrapper);
- return organization;
+ public Organization getOrganizationById(Integer id) {
+ return organizationMapper.selectById(id);
}
+
+
/**
* @Description: ���������������������������������������������������children���
@@ -52,6 +58,7 @@
*/
private void recursionQueryChildren(Integer parentId, List<Organization> children) {
QueryWrapper<Organization> queryWrapper = new QueryWrapper();
+ queryWrapper.select("id");
queryWrapper.eq("is_delete", Constants.NOT_DELETE);
queryWrapper.eq("parent_id", parentId);
List<Organization> organizations = organizationMapper.selectList(queryWrapper);
@@ -64,4 +71,9 @@
return;
}
}
+
+ @Override
+ public List<Integer> orgIdList(Integer organizationId) {
+ return this.baseMapper.orgIdList(organizationId);
+ }
}
--
Gitblit v1.8.0