From 14949a6a6e7dec654d13e75f46b24319a624ff8b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 30 Oct 2023 17:13:34 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb
---
screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java | 32 ++++++++++++++++++++++++++------
1 files changed, 26 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..6458feb 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,10 @@
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.Organization;
import com.moral.api.mapper.OrganizationMapper;
+import com.moral.api.pojo.vo.user.QxUser;
import com.moral.api.service.OrganizationService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.constant.Constants;
@@ -27,6 +29,7 @@
@Autowired
OrganizationMapper organizationMapper;
+
@Override
public List<Organization> getChildrenOrganizationsById(Integer id) {
List<Organization> childrenOrganization = new ArrayList<>();
@@ -35,13 +38,29 @@
}
@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);
}
+
+ /**
+ * ������������������������
+ *
+ * @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);
+ return organizations;
+ }
+
/**
* @Description: ���������������������������������������������������children���
@@ -52,6 +71,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);
--
Gitblit v1.8.0