1.优化外部数据同步接口

maintain-admin/src/main/java/com/maintain/web/controller/system/SysUserController.java

 package com.maintain.web.controller.system;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import cn.dev33.satoken.annotation.SaIgnore;
 import cn.dev33.satoken.secure.BCrypt;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.tree.Tree;

maintain-system/src/main/java/com/maintain/system/service/impl/SysDeptServiceImpl.java

@@ -337,11 +337,14 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService {
         String res = com.zxw.util.tm.HttpTmEncryptUtil.sendPostRequest("http://10.100.102.67:22220/api/basis/deptInfoExtRepair", null, null);
         Map map = JSONUtil.toBean(res, Map.class);
         List<ExternalDept> departmentList = JSONUtil.toList(JSONUtil.toJsonStr(map.get("data")), ExternalDept.class);
+        List<SysDept> sysDeptList = baseMapper.selectList();
         departmentList.forEach(department -> {
-            SysDept selectOne = baseMapper.selectOne(new LambdaQueryWrapper<SysDept>().eq(SysDept::getExternalDeptCode, department.getDeptCode()));
             // 查询是否已存在系统
-            if (null == selectOne) {
-                SysDept dept = baseMapper.selectOne(new LambdaQueryWrapper<SysDept>().eq(SysDept::getExternalDeptCode, department.getUpperDeptCode()));
+            System.out.println("编号："+department.getDeptCode()+",部门" + department.getDeptName());
+            if (sysDeptList.stream().noneMatch(item -> null != item.getExternalDeptCode() && item.getExternalDeptCode().equals(department.getDeptCode()))) {
+                SysDept dept = sysDeptList.stream().filter(item -> item.getExternalDeptCode().equals(department.getUpperDeptCode()))
+                    .findFirst()
+                    .orElseThrow(() -> new RuntimeException("未找到部门=" + department.getUpperDeptCode()));
                 if (dept != null) {
                     SysDept sysDept = new SysDept();
                     sysDept.setAncestors(dept.getAncestors() + StringUtils.SEPARATOR + dept.getDeptId());

maintain-ui/src/views/system/dept/index.vue

@@ -321,7 +321,7 @@ export default {
     clickSync() {
       const loading = this.$loading({
         lock: true,
-        text: '数据同步中，预计需要5-30秒',
+        text: '数据同步中，预计需要5-10秒',
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       });

maintain-ui/src/views/system/user/index.vue

@@ -658,7 +658,7 @@ export default {
     clickSync() {
       const loading = this.$loading({
         lock: true,
-        text: '数据同步中，预计需要5-30秒',
+        text: '数据同步中，预计需要5-10秒',
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       });