From 2892b2a80babdde59f8dcf6750b26870a6d6a853 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: Mon, 16 Jun 2025 14:05:41 +0800
Subject: [PATCH] 部分功能调整

---
 multi-system/src/main/java/com/gkhy/exam/system/service/impl/SysDeptServiceImpl.java |   28 ++++++++++++++++++++++------
 1 files changed, 22 insertions(+), 6 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 a35cc97..77338d2 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
@@ -28,6 +28,7 @@
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.util.*;
@@ -64,6 +65,9 @@
 
     public List<DeptVo> selectDeptList(SysDept dept)
     {
+        if (dept.getCompanyId() == null){
+            dept.setCompanyId(SecurityUtils.getCompanyId());
+        }
         return deptMapper.selectDeptList(dept);
     }
 
@@ -208,7 +212,7 @@
     public boolean checkDeptNameUnique(SysDept dept)
     {
         Long deptId = ObjectUtil.isNull(dept.getDeptId()) ? -1L : dept.getDeptId();
-        Long companyId = SecurityUtils.getLoginUser().getUser().getCompanyId();
+        Long companyId = SecurityUtils.getCompanyId();
 
         SysDept info = deptMapper.checkDeptNameUnique(companyId,dept.getDeptName(), dept.getParentId());
         if (ObjectUtil.isNotNull(info) && info.getDeptId().longValue() != deptId.longValue())
@@ -258,8 +262,9 @@
     }
 
     @Override
+    @Transactional
     public int saveDept(SysDeptSaveDTOReq dept) {
-        Long companyId = SecurityUtils.getLoginUser().getUser().getCompanyId();
+        Long companyId = SecurityUtils.getCompanyId();
         if (!companyId.equals(dept.getCompanyId())){
             throw new ApiException("无权操作！");
         }
@@ -294,8 +299,9 @@
     }
 
     @Override
+    @Transactional
     public int saveDeptResponsibility(SysDeptResponsibilityReqVo reqVo) {
-        Long companyId = SecurityUtils.getLoginUser().getUser().getCompanyId();
+        Long companyId = SecurityUtils.getCompanyId();
         if (!companyId.equals(reqVo.getCompanyId())){
             throw new ApiException("无权操作！");
         }
@@ -324,13 +330,16 @@
 
     @Override
     public List<SysFunctionalDistribution> getFunctionalDistributionList(Long companyId) {
+        if (companyId != null){
+            companyId = SecurityUtils.getCompanyId();
+        }
        return sysFunctionalDistributionMapper.selectListVo(companyId);
     }
 
     @Override
     public int initFunctionalDistribution(Long companyId) {
 
-        if (!companyId.equals(SecurityUtils.getLoginUser().getUser().getCompanyId())){
+        if (!companyId.equals(SecurityUtils.getCompanyId())){
             throw new ApiException("无权操作！");
         }
         sysFunctionalDistributionMapper.delete(new LambdaQueryWrapper<SysFunctionalDistribution>().eq(SysFunctionalDistribution::getCompanyId, SecurityUtils.getLoginUser().getUser().getCompanyId()));
@@ -396,9 +405,14 @@
         if (emptyIdClauseNumSet.size() !=  emptyIdClauseNums.size()){
             throw new ApiException("部门条款编码重复！");
         }
+        List<Long> emptyIdClauseIds = sysDeptResponsibilityList.stream()
+                .filter(item -> item.getId() != null)
+                .map(SysDeptResponsibility::getId)
+                .collect(Collectors.toList());
+
         if (!emptyIdClauseNums.isEmpty()){
             List<SysDeptResponsibility> sysDeptResponsibilities = deptResponsibilityMapper.selectList(new LambdaQueryWrapper<SysDeptResponsibility>()
-                    .eq(SysDeptResponsibility::getDeptId, reqVo.getDeptId()).in(SysDeptResponsibility::getClauseNum, emptyIdClauseNums));
+                    .eq(SysDeptResponsibility::getDeptId, reqVo.getDeptId()).in(SysDeptResponsibility::getClauseNum, emptyIdClauseNums).notIn(SysDeptResponsibility::getId, emptyIdClauseIds));
             if (!sysDeptResponsibilities.isEmpty()){
                 throw new ApiException("部门条款编码重复！");
             }
@@ -426,7 +440,7 @@
                 .update(new SysDeptResponsibility(),
                         new LambdaUpdateWrapper<SysDeptResponsibility>().set(SysDeptResponsibility::getDelFlag, UserConstant.DEPT_DISABLE)
                                 .set(SysDeptResponsibility::getUpdateTime, LocalDateTime.now()).set(SysDeptResponsibility::getUpdateBy, SecurityUtils.getUsername())
-                                .eq(SysDeptResponsibility::getDeptId, deptId));
+                                .eq(SysDeptResponsibility::getDeptId, deptId).in(SysDeptResponsibility::getId, delCaluseIds));
     }
 
     private void batchSaveCaluse(Long deptId,Long companyId, List<CaluseVO1> caluseVO1List) {
@@ -449,9 +463,11 @@
             sysDeptResponsibility.setCompanyId(companyId);
             sysDeptResponsibility.setDeptId(deptId);
 
+
             if (sysDeptResponsibility.getId() == null){
                 sysDeptResponsibility.setCreateBy(SecurityUtils.getUsername());
                 sysDeptResponsibility.setCreateTime(LocalDateTime.now());
+                sysDeptResponsibility.setDataType("2");
                 deptResponsibilityMapper.insert(sysDeptResponsibility);
             }else {
                 sysDeptResponsibility.setUpdateBy(SecurityUtils.getUsername());

--
Gitblit v1.9.2