From d117d3af15dddc4f07baffa8b5bf6b727c05de7c Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 15 Nov 2023 15:48:14 +0800
Subject: [PATCH] fix:补充提交

---
 screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java |   23 ++++++++++++++++-------
 1 files changed, 16 insertions(+), 7 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 0d730ba..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;
@@ -28,6 +34,7 @@
     OrganizationMapper organizationMapper;
 
 
+
     @Override
     public List<Organization> getChildrenOrganizationsById(Integer id) {
         List<Organization> childrenOrganization = new ArrayList<>();
@@ -36,14 +43,11 @@
     }
 
     @Override
-    public Organization getStateControlStation() {
-        QueryWrapper<Organization> wrapper = new QueryWrapper<>();
-        wrapper.select("id");
-        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���
@@ -67,4 +71,9 @@
             return;
         }
     }
+
+    @Override
+    public List<Integer> orgIdList(Integer organizationId) {
+        return this.baseMapper.orgIdList(organizationId);
+    }
 }

--
Gitblit v1.8.0