From 0eb2de47356408212a2641801ac7fd1aed7f5c33 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 20 二月 2025 09:41:57 +0800
Subject: [PATCH] 优化分配权限代码 默认新增添加管理员权限

---
 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepServiceImpl.java |   80 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 79 insertions(+), 1 deletions(-)

diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepServiceImpl.java
index 0c6c8b0..dbd3865 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepServiceImpl.java
@@ -20,6 +20,7 @@
 import org.jeecg.modules.dnc.service.*;
 import org.jeecg.modules.dnc.utils.ValidateUtil;
 import org.jeecg.modules.system.entity.MdcProduction;
+import org.jeecg.modules.system.entity.SysUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -46,7 +47,7 @@
     private IWorkStepDepartmentService workStepDepartmentService;
 
     @Autowired
-    private IDocInfoService docInfoService;
+    private IWorkStepPermissionService workStepPermissionService;
 
     @Autowired
     private IDocRelativeService iDocRelativeService;
@@ -279,4 +280,81 @@
         return super.removeById(id);
     }
 
+    @Override
+    @Transactional(rollbackFor = {Exception.class})
+    public boolean assignAddUser(WorkStep workStep, Collection<SysUser> userList) {
+        if(workStep == null || userList == null || userList.isEmpty())
+            ExceptionCast.cast(CommonCode.INVALID_PARAM);
+        List<WorkStepPermission> permissionList = new ArrayList<>();
+        List<PermissionStream> permissionStreamList = new ArrayList<>();
+        userList.forEach(item -> {
+            WorkStepPermission en = workStepPermissionService.getByStepIdAndUserId(workStep.getId(), item.getId());
+            if(en == null) {
+                en = new WorkStepPermission();
+                en.setUserId(item.getId());
+                en.setStepId(workStep.getId());
+                permissionList.add(en);
+            }
+            PermissionStream stream = permissionStreamService.getByStepIdAndUserId(workStep.getProductId(), workStep.getComponentId(), workStep.getPartsId()
+                    ,workStep.getProcessId(),workStep.getId(), item.getId());
+            if(stream == null) {
+                stream = new PermissionStream();
+                stream.setUserId(item.getId());
+                stream.setProductId(workStep.getProductId());
+                stream.setComponentId(workStep.getComponentId());
+                stream.setPartsId(workStep.getPartsId());
+                stream.setProcessId(workStep.getProcessId());
+                stream.setStepId(workStep.getId());
+                permissionStreamList.add(stream);
+            }
+        });
+        if(!permissionList.isEmpty()) {
+            boolean b = workStepPermissionService.saveBatch(permissionList);
+            if(!b) {
+                ExceptionCast.cast(ProductInfoCode.PRODUCT_USER_PERM_ERROR);
+            }
+        }
+        if(!permissionStreamList.isEmpty()) {
+            boolean b = permissionStreamService.saveBatch(permissionStreamList);
+            if(!b) {
+                ExceptionCast.cast(ProductInfoCode.PRODUCT_USER_PERM_ERROR);
+            }
+        }
+        return true;
+    }
+
+    @Override
+    @Transactional(rollbackFor = {Exception.class})
+    public boolean assignRemoveUser(WorkStep workStep, Collection<SysUser> userList) {
+        if(workStep == null || userList == null || userList.isEmpty())
+            ExceptionCast.cast(CommonCode.INVALID_PARAM);
+        List<WorkStepPermission> permissionList = new ArrayList<>();
+        List<PermissionStream> permissionStreamList = new ArrayList<>();
+        userList.forEach(item -> {
+            WorkStepPermission en = workStepPermissionService.getByStepIdAndUserId(workStep.getId(), item.getId());
+            if(en != null) {
+                permissionList.add(en);
+            }
+            PermissionStream stream = permissionStreamService.getByStepIdAndUserId(workStep.getProductId(), workStep.getComponentId(),
+                    workStep.getPartsId(),workStep.getProcessId(), workStep.getId(),item.getId());
+            if(stream != null) {
+                permissionStreamList.add(stream);
+            }
+        });
+        //娓呯┖鐢ㄦ埛鏉冮檺鏍¢獙
+        if(!permissionList.isEmpty()) {
+            boolean b = workStepPermissionService.removeByCollection(permissionList);
+            if(!b) {
+                ExceptionCast.cast(ProductInfoCode.PRODUCT_USER_PERM_ERROR);
+            }
+        }
+        if(!permissionStreamList.isEmpty()) {
+            boolean b = permissionStreamService.removeByCollection(permissionStreamList);
+            if(!b) {
+                ExceptionCast.cast(ProductInfoCode.PRODUCT_USER_PERM_ERROR);
+            }
+        }
+        return true;
+    }
+
 }

--
Gitblit v1.9.3