From 01a30369e55a754c28dec4939a99e59aefecdc60 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 08 八月 2024 20:48:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java |   75 +++++++++++++++++++++++++++----------
 1 files changed, 55 insertions(+), 20 deletions(-)

diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java
index 35e1fab..dd9e350 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java
@@ -1,39 +1,39 @@
 package com.ycl.platform.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-
 import com.ycl.platform.base.BaseSelect;
 import com.ycl.platform.domain.entity.YwUnit;
 import com.ycl.platform.domain.form.YwUnitForm;
 import com.ycl.platform.domain.query.YwUnitQuery;
 import com.ycl.platform.domain.vo.YwUnitVO;
-import com.ycl.system.Result;
 import com.ycl.platform.mapper.YwUnitMapper;
+import com.ycl.platform.service.YwUnitService;
+import com.ycl.system.Result;
 import com.ycl.system.domain.SysUserRole;
 import com.ycl.system.entity.SysRole;
 import com.ycl.system.entity.SysUser;
 import com.ycl.system.mapper.SysRoleMapper;
 import com.ycl.system.mapper.SysUserMapper;
 import com.ycl.system.mapper.SysUserRoleMapper;
+import com.ycl.system.model.LoginUser;
 import com.ycl.system.page.PageUtil;
-import com.ycl.platform.service.YwUnitService;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ycl.utils.DateUtils;
 import com.ycl.utils.SecurityUtils;
-import org.springframework.stereotype.Service;
+import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
-import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
-import lombok.RequiredArgsConstructor;
-import org.springframework.util.StringUtils;
 
 /**
  * 杩愮淮鍗曚綅 鏈嶅姟瀹炵幇绫�
@@ -56,6 +56,7 @@
      * @return
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Result add(YwUnitForm form) {
         YwUnit entity = YwUnitForm.getEntityByForm(form, null);
         if(baseMapper.insert(entity) > 0) {
@@ -86,6 +87,7 @@
      * @return
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Result update(YwUnitForm form) {
         YwUnit entity = baseMapper.selectById(form.getId());
 
@@ -111,15 +113,16 @@
      * @return
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Result remove(List<String> ids) {
-        ids.forEach(id -> {
-            // 鍒犻櫎杩愮淮浜哄憳璐﹀彿
-            SysUser sysUser = sysUserMapper.selectUserByUserName(baseMapper.selectById(id).getUnitAdminAccount());
-            if (Objects.nonNull(sysUser)) {
-                sysUserRoleMapper.deleteUserRoleByUserId(sysUser.getUserId());
-                sysUserMapper.deleteUserById(sysUser.getUserId());
-            }
-        });
+        List<Long> userIds = sysUserMapper.selectUserIdByNames(
+                baseMapper.selectList(
+                        new LambdaQueryWrapper<YwUnit>().in(YwUnit::getId, ids))
+                        .stream().map(YwUnit::getUnitAdminAccount).toList());
+        if (!userIds.isEmpty()) {
+            sysUserMapper.deleteUserByIds(userIds.toArray(new Long[0]));
+            sysUserRoleMapper.deleteUserRoleByUserIds(userIds);
+        }
         if(baseMapper.deleteBatchIds(ids) > 0) {
             return Result.ok("鍒犻櫎鎴愬姛");
         }
@@ -207,6 +210,33 @@
     }
 
     @Override
+    public Result workList() {
+        List<YwUnitVO> entities = baseMapper.workList();
+        return Result.ok().data(entities);
+    }
+
+    @Override
+    public void setUnitInfo(LoginUser loginUser) {
+        // 鍗曚綅绠$悊鍛樻煡璇�
+        YwUnit unit = new LambdaQueryChainWrapper<>(baseMapper)
+                .eq(YwUnit::getUnitAdminAccount, loginUser.getUsername())
+                .one();
+        if (Objects.nonNull(unit)) {
+            loginUser.setUnitAdmin(Boolean.TRUE);
+            loginUser.setUnitId(unit.getId());
+        } else {
+            unit = baseMapper.getByUserId(loginUser.getUserId());
+            if (Objects.nonNull(unit)) {
+                loginUser.setUnitAdmin(Boolean.FALSE);
+                loginUser.setUnitId(unit.getId());
+            }
+            else {
+                loginUser.setUnitAdmin(Boolean.FALSE);
+            }
+        }
+    }
+
+    @Override
     public List<YwUnitVO> export(YwUnitQuery query) {
         // 鍒嗛〉鏉′欢鏌ヨ浣�
         IPage<YwUnit> page = new LambdaQueryChainWrapper<>(baseMapper)
@@ -226,4 +256,9 @@
                 .collect(Collectors.toList());
         return vos;
     }
+
+    @Override
+    public List<Map<String, Object>> ywUnitCount() {
+        return baseMapper.ywUnitCount();
+    }
 }

--
Gitblit v1.8.0