From 076baf821f6ff0296826ecebac31b45ecce346a3 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期三, 25 六月 2025 15:19:17 +0800
Subject: [PATCH] 部分功能调整

---
 multi-system/src/main/java/com/gkhy/exam/system/service/impl/SysDeptServiceImpl.java |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/SysDeptServiceImpl.java b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/SysDeptServiceImpl.java
index a186588..425c716 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/SysDeptServiceImpl.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/SysDeptServiceImpl.java
@@ -333,13 +333,14 @@
     }
 
     @Override
+    @Transactional
     public int initFunctionalDistribution(Long companyId) {
 
         if (!companyId.equals(SecurityUtils.getCompanyId())){
             throw new ApiException("无权操作!");
         }
-        sysFunctionalDistributionMapper.delete(new LambdaQueryWrapper<SysFunctionalDistribution>().eq(SysFunctionalDistribution::getCompanyId, SecurityUtils.getLoginUser().getUser().getCompanyId()));
 
+        sysFunctionalDistributionMapper.delByCompanyId(companyId);
         SysDept sysDept = new SysDept();
         sysDept.setCompanyId(companyId);
         List<DeptVo> deptVos = deptMapper.selectDeptList(sysDept);
@@ -369,11 +370,19 @@
 
     @Override
     public int saveFunctionalDistribution(FunctionalDistributionVo reqVo) {
-        Long companyId = SecurityUtils.getLoginUser().getUser().getCompanyId();
+        Long companyId = SecurityUtils.getCompanyId();
         if (!companyId.equals(reqVo.getCompanyId())){
             throw new ApiException("无权操作!");
         }
         List<SysFunctionalDistribution> list = reqVo.getList();
+        if (list != null && !list.isEmpty())
+        {
+            for (SysFunctionalDistribution sysFunctionalDistribution : list) {
+                sysFunctionalDistribution.setCompanyId(companyId);
+                sysFunctionalDistribution.setUpdateBy(SecurityUtils.getUsername());
+                sysFunctionalDistribution.setUpdateTime(LocalDateTime.now());
+            }
+        }
         int i = sysFunctionalDistributionMapper.batchUpdate(list);
         if (i < 1){
             throw new ApiException("保存失败!");
@@ -408,7 +417,9 @@
 
         if (!emptyIdClauseNums.isEmpty()){
             List<SysDeptResponsibility> sysDeptResponsibilities = deptResponsibilityMapper.selectList(new LambdaQueryWrapper<SysDeptResponsibility>()
-                    .eq(SysDeptResponsibility::getDeptId, reqVo.getDeptId()).in(SysDeptResponsibility::getClauseNum, emptyIdClauseNums).notIn(SysDeptResponsibility::getId, emptyIdClauseIds));
+                    .eq(SysDeptResponsibility::getDeptId, reqVo.getDeptId())
+                    .in(SysDeptResponsibility::getClauseNum, emptyIdClauseNums)
+                    .notIn(SysDeptResponsibility::getId, emptyIdClauseIds).eq(SysDeptResponsibility::getDelFlag, "0"));
             if (!sysDeptResponsibilities.isEmpty()){
                 throw new ApiException("部门条款编码重复!");
             }
@@ -447,7 +458,8 @@
                 .collect(Collectors.toList());
         if (!emptyIdClauseNums.isEmpty()){
             List<SysDeptResponsibility> sysDeptResponsibilities = deptResponsibilityMapper.selectList(new LambdaQueryWrapper<SysDeptResponsibility>()
-                    .eq(SysDeptResponsibility::getDeptId, deptId).in(SysDeptResponsibility::getClauseNum, emptyIdClauseNums));
+                    .eq(SysDeptResponsibility::getDeptId, deptId).in(SysDeptResponsibility::getClauseNum, emptyIdClauseNums)
+                    .eq(SysDeptResponsibility::getCompanyId, companyId).eq(SysDeptResponsibility::getDelFlag, "0"));
             if (!sysDeptResponsibilities.isEmpty()){
                 throw new ApiException("部门条款编码重复!");
             }

--
Gitblit v1.9.2