From 661e56eb85e3bd0e35e94fca2d2ec59e77772da5 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 01 Feb 2024 15:30:57 +0800
Subject: [PATCH] fix:补充提交

---
 screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java |   54 +++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 47 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..8f75d49 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,17 +1,27 @@
 package com.moral.api.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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;
+import com.moral.util.TokenUtils;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -28,6 +38,7 @@
     OrganizationMapper organizationMapper;
 
 
+
     @Override
     public List<Organization> getChildrenOrganizationsById(Integer id) {
         List<Organization> childrenOrganization = new ArrayList<>();
@@ -36,14 +47,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 +75,36 @@
             return;
         }
     }
+
+    @Override
+    public List<Integer> orgIdList(Integer organizationId) {
+        return this.baseMapper.orgIdList(organizationId);
+    }
+
+    /**
+     * ������id������������������
+     *
+     * @param
+     * @return
+     */
+    @Override
+    public List<Organization> getOrganizationId() {
+        //������������������
+        Map<String, Object> userInfo = (Map<String, Object>) TokenUtils.getUserInfo();
+        Map<String, Object> orgInfo = (Map<String, Object>) userInfo.get("organization");
+        Integer organizationId = (Integer) orgInfo.get("id");
+         ArrayList<Organization> rsList = new ArrayList<>();
+        if (organizationId==24){
+            LambdaQueryWrapper<Organization> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(Organization::getParentId,organizationId);
+            wrapper.eq(Organization::getIsDelete,Constants.NOT_DELETE);
+            wrapper.orderByDesc(Organization::getCreateTime);
+            List<Organization> organizations = organizationMapper.selectList(wrapper);
+            rsList.addAll(organizations);
+        }else {
+            Organization organizationById = this.getOrganizationById(organizationId);
+            rsList.add(organizationById);
+        }
+        return rsList;
+    }
 }

--
Gitblit v1.8.0