From 4edd63bcd21b999e0782047ca0602f9e915cd94c Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 11 Mar 2021 08:23:32 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java | 37 +++++++++++++++++++++++++++++++++++++
1 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java
index ac9d7c7..59f014e 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java
@@ -1,9 +1,17 @@
package com.moral.api.service.impl;
+import java.util.HashMap;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.entity.Group;
+import com.moral.api.entity.User;
import com.moral.api.mapper.GroupMapper;
+import com.moral.api.mapper.UserMapper;
import com.moral.api.service.GroupService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
@@ -17,4 +25,33 @@
@Service
public class GroupServiceImpl extends ServiceImpl<GroupMapper, Group> implements GroupService {
+ @Autowired
+ private GroupMapper groupMapper;
+
+ @Autowired
+ private UserMapper userMapper;
+
+ @Override
+ public Map<String, Object> addGroup(Group group, String currentUserId) {
+ Map<String, Object> resultMap = new HashMap<>();
+ User currentUser = userMapper.selectById(currentUserId);
+ if (!currentUser.getIsAdmin()) {
+ resultMap.put("flag", false);
+ resultMap.put("msg", "���������������������������");
+ return resultMap;
+ }
+ Integer orgId = currentUser.getOrganizationId();
+ QueryWrapper<Group> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("group_name", group.getGroupName()).eq("organization_id", orgId);
+ if (groupMapper.selectOne(queryWrapper) == null) {
+ group.setOrganizationId(orgId);
+ groupMapper.insert(group);
+ resultMap.put("flag", true);
+ resultMap.put("msg", "������������");
+ } else {
+ resultMap.put("flag", false);
+ resultMap.put("msg", "���������������������������");
+ }
+ return resultMap;
+ }
}
--
Gitblit v1.8.0