From 8ed49f54d98e817913abb8a9f4751e3bc3b0b40a Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 06 Nov 2023 16:56:07 +0800
Subject: [PATCH] chore:补充提交
---
screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java | 30 +++---------------------------
1 files changed, 3 insertions(+), 27 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 b009485..98ad2cd 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
@@ -2,10 +2,13 @@
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;
@@ -30,8 +33,6 @@
@Autowired
OrganizationMapper organizationMapper;
- @Autowired
- private DeviceService deviceService;
@Override
@@ -46,31 +47,6 @@
return organizationMapper.selectById(id);
}
- /**
- * ������������������������
- *
- * @return
- */
- @Override
- public List<Organization> getOrganizations() {
- QueryWrapper<Organization> wrapper = new QueryWrapper<>();
- wrapper.select("id","name");
- QxUser user = UserHelper.getCurrentUser();
- Integer organizationId = user.getOrganizationId();
- if (organizationId!=24){
- wrapper.eq("id",user.getOrganizationId());
- }
- wrapper.eq("is_delete",Constants.NOT_DELETE);
- List<Organization> organizations = organizationMapper.selectList(wrapper);
- for (int i=0; i<organizations.size(); i++) {
- List<String> macs = deviceService.getMacsByOrganizationId(organizations.get(i).getId());
- if (ObjectUtils.isEmpty(macs)){
- organizations.remove(i);
- i--;
- }
- }
- return organizations;
- }
/**
--
Gitblit v1.8.0