From 44036f6e3f4d443d58f594774ef89221f7a87036 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: Mon, 02 Feb 2026 17:28:34 +0800
Subject: [PATCH] 增加初始化数据

---
 multi-system/src/main/java/com/gkhy/exam/system/service/impl/SysDeptServiceImpl.java |   97 +++++++++++++++++++++++++++++++++---------------
 1 files changed, 66 insertions(+), 31 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 f8f60f1..7352de7 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
@@ -16,10 +16,7 @@
 import com.gkhy.exam.common.utils.PageUtils;
 import com.gkhy.exam.common.utils.SecurityUtils;
 import com.gkhy.exam.common.utils.SpringUtils;
-import com.gkhy.exam.system.domain.SysDeptManage;
-import com.gkhy.exam.system.domain.SysDeptResponsibility;
-import com.gkhy.exam.system.domain.SysFunctionalDistribution;
-import com.gkhy.exam.system.domain.SysFunctionalRemark;
+import com.gkhy.exam.system.domain.*;
 import com.gkhy.exam.system.domain.req.SysDeptPageReq;
 import com.gkhy.exam.system.domain.vo.*;
 import com.gkhy.exam.system.mapper.*;
@@ -57,10 +54,12 @@
     @Autowired
     private SysFunctionalRemarkMapper sysFunctionalRemarkMapper;
 
-    public static final String[] DEPT_ROOT = {"4","4.1",  "4.2", "4.3", "4.4","5", "5.1", "5.2", "5.3","6","6.1", "6.2", "6.3"
-            ,"7","7.1.1",  "7.1.2", "7.1.3", "7.1.4", "7.1.5", "7.1.6","7.2", "7.3", "7.4", "7.5", "7.6","8","8.1","8.2","8.2.1","8.2.2", "8.2.3", "8.2.4", "8.3", "8.3.1", "8.3.2", "8.3.3", "8.3.4", "8.3.5", "8.3.6", "8.3.7", "8.3.8", "8.4",
+    public static final String[] DEPT_ROOT = {"4","4.1",  "4.2", "4.3", "4.4","5", "5.1","5.1.1","5.1.2", "5.2", "5.3","6","6.1", "6.2", "6.3"
+            ,"7","7.1","7.1.1",  "7.1.2", "7.1.3", "7.1.4", "7.1.5", "7.1.6","7.2", "7.3", "7.4", "7.5", "7.6","8","8.1","8.2","8.2.1","8.2.2", "8.2.3", "8.2.4", "8.3", "8.3.1", "8.3.2", "8.3.3", "8.3.4", "8.3.5", "8.3.6", "8.3.7", "8.3.8", "8.4",
     "8.4.1", "8.4.2", "8.4.3", "8.5", "8.5.1", "8.5.2", "8.5.3", "8.5.4", "8.5.5", "8.5.6", "8.5.7", "8.6","8.7","9","9.1","9.1.1","9.1.2","9.1.3","9.2", "9.3","10","10.1"
             ,"10.2", "10.3"};
+    @Autowired
+    private SysClauseManagementMapper sysClauseManagementMapper;
 
     @Override
     public CommonPage selectDeptPageList(SysDeptPageReq req) {
@@ -442,33 +441,69 @@
                             ));
                 }
                 //加入职能
-                for (String s : DEPT_ROOT) {
-                    SysFunctionalDistribution sysFunctionalDistribution = new SysFunctionalDistribution();
-                    sysFunctionalDistribution.setDeptId(deptVo.getDeptId());
-                    sysFunctionalDistribution.setCompanyId(companyId);
-                    sysFunctionalDistribution.setCreateBy(SecurityUtils.getUsername());
-                    sysFunctionalDistribution.setCreateTime(LocalDateTime.now());
-                    sysFunctionalDistribution.setClauseNum(s);
-                    if (clauseNumMap.isEmpty()){
-                        sysFunctionalDistribution.setChooseLab(0);
-                    }else if (clauseNumMap.containsKey(s)){
-                        sysFunctionalDistribution.setChooseLab(1);
-                        if (deptVo.getDeptType().equals("0")){
-                            Integer i = clauseNumSetNum.get(s);
-                            if (i == null){
-                                i = 0;
-                                clauseNumSetNum.put(s, ++i);
-                            }else {
-                                clauseNumSetNum.put(s, ++i);
-                                clauseNumSet.add(s);
-                            }
-                        }
-                    }else {
-                        sysFunctionalDistribution.setChooseLab(0);
-                    }
+                LambdaQueryWrapper<SysClauseManagement> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.select(SysClauseManagement::getClauseNum).eq(SysClauseManagement::getDelFlag, "0").orderByAsc(SysClauseManagement::getClauseNum);
+                List<SysClauseManagement> sysClauseManagements = sysClauseManagementMapper.selectList(queryWrapper);
+                if (ObjectUtil.isNotEmpty(sysClauseManagements)){
+                    Set<String> clauseNumSetSt = sysClauseManagements.stream()
+                            .map(SysClauseManagement::getClauseNum)
+                            .collect(Collectors.toSet());
 
-                    sysFunctionalDistributions.add(sysFunctionalDistribution);
+                    for (String s : clauseNumSetSt) {
+                        SysFunctionalDistribution sysFunctionalDistribution = new SysFunctionalDistribution();
+                        sysFunctionalDistribution.setDeptId(deptVo.getDeptId());
+                        sysFunctionalDistribution.setCompanyId(companyId);
+                        sysFunctionalDistribution.setCreateBy(SecurityUtils.getUsername());
+                        sysFunctionalDistribution.setCreateTime(LocalDateTime.now());
+                        sysFunctionalDistribution.setClauseNum(s);
+                        if (clauseNumMap.isEmpty()){
+                            sysFunctionalDistribution.setChooseLab(0);
+                        }else if (clauseNumMap.containsKey(s)){
+                            sysFunctionalDistribution.setChooseLab(1);
+                            if (deptVo.getDeptType().equals("0")){
+                                Integer i = clauseNumSetNum.get(s);
+                                if (i == null){
+                                    i = 0;
+                                    clauseNumSetNum.put(s, ++i);
+                                }else {
+                                    clauseNumSetNum.put(s, ++i);
+                                    clauseNumSet.add(s);
+                                }
+                            }
+                        }else {
+                            sysFunctionalDistribution.setChooseLab(0);
+                        }
+
+                        sysFunctionalDistributions.add(sysFunctionalDistribution);
+                    }
                 }
+//                for (String s : DEPT_ROOT) {
+//                    SysFunctionalDistribution sysFunctionalDistribution = new SysFunctionalDistribution();
+//                    sysFunctionalDistribution.setDeptId(deptVo.getDeptId());
+//                    sysFunctionalDistribution.setCompanyId(companyId);
+//                    sysFunctionalDistribution.setCreateBy(SecurityUtils.getUsername());
+//                    sysFunctionalDistribution.setCreateTime(LocalDateTime.now());
+//                    sysFunctionalDistribution.setClauseNum(s);
+//                    if (clauseNumMap.isEmpty()){
+//                        sysFunctionalDistribution.setChooseLab(0);
+//                    }else if (clauseNumMap.containsKey(s)){
+//                        sysFunctionalDistribution.setChooseLab(1);
+//                        if (deptVo.getDeptType().equals("0")){
+//                            Integer i = clauseNumSetNum.get(s);
+//                            if (i == null){
+//                                i = 0;
+//                                clauseNumSetNum.put(s, ++i);
+//                            }else {
+//                                clauseNumSetNum.put(s, ++i);
+//                                clauseNumSet.add(s);
+//                            }
+//                        }
+//                    }else {
+//                        sysFunctionalDistribution.setChooseLab(0);
+//                    }
+//
+//                    sysFunctionalDistributions.add(sysFunctionalDistribution);
+//                }
 
             }
             int i = sysFunctionalDistributionMapper.batchInsert(sysFunctionalDistributions);

--
Gitblit v1.9.2