feature: 同步业务完善

1.同步教务班级与研究生班级时的默认父部门

ruoyi-server/ruoyi-server-base/src/main/java/org/dromara/server/base/service/dept/strategy/impl/GraduateClassStrategyImpl.java

@@ -6,6 +6,7 @@ import cn.hutool.core.util.StrUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.dromara.common.core.config.DefaultConfig;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.json.utils.JsonUtils;
 import org.dromara.server.base.service.dept.SyncRemoteDeptService;
@@ -36,6 +37,7 @@ import java.util.List;
 @Service(SyncResourceConstants.GRADUATE_CLASS)
 public class GraduateClassStrategyImpl implements ISyncDeptStrategy {
     private final SyncRemoteDeptService syncRemoteDeptService;
+    private final DefaultConfig defaultConfig;
 
     @Override
     public void syncDept(List<ResourceDept> deptList) {
@@ -65,7 +67,7 @@ public class GraduateClassStrategyImpl implements ISyncDeptStrategy {
     private R<Object> syncDept(ResourceDept resourceDept) {
         String tenantId = resourceDept.getTenantId();
         if (StrUtil.isEmpty(tenantId)) {
-            tenantId = DefaultConstants.TENANT_ID;
+            tenantId = defaultConfig.getTenantId();
             resourceDept.setTenantId(tenantId);
         }
 
@@ -145,7 +147,7 @@ public class GraduateClassStrategyImpl implements ISyncDeptStrategy {
      * @return 部门信息
      */
     private RemoteDeptVo doYearDept(ResourceDept resourceDept) {
-        // 检查年份对应的部门，年份的父节点固定为在校研究生->162
+        // 检查年份对应的部门
         Long rootId = DefaultConstants.GRADUATE_PARENT_DEPT_ID;
         RemoteDeptVo yearDeptVo = syncRemoteDeptService.selectDeptByParentIdAndName(rootId, resourceDept.getYear().toString());
         if (yearDeptVo != null) {
@@ -153,7 +155,7 @@ public class GraduateClassStrategyImpl implements ISyncDeptStrategy {
         }
         // 不存在对应的部门，需要增加
         RemoteDeptBo remoteDeptBo = new RemoteDeptBo();
-        remoteDeptBo.setDeptName(resourceDept.getYear().toString());
+        remoteDeptBo.setDeptName(resourceDept.getYear().toString()+ "级");
         remoteDeptBo.setDeptType(DefaultConstants.YEAR_DEPT_TYPE);
         remoteDeptBo.setCreateBy(resourceDept.getOperatorId());
         remoteDeptBo.setParentId(rootId);

ruoyi-server/ruoyi-server-base/src/main/java/org/dromara/server/base/service/dept/strategy/impl/TrainClassStrategyImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.StrUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.config.DefaultConfig;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.domain.model.ErrorInfo;
 import org.dromara.common.core.utils.StringUtils;
@@ -40,6 +41,7 @@ import java.util.List;
 public class TrainClassStrategyImpl implements ISyncDeptStrategy {
 
     private final SyncRemoteDeptService syncRemoteDeptService;
+    private final DefaultConfig defaultConfig;
 
     @Override
     public void syncDept(List<ResourceDept> deptList) {
@@ -99,7 +101,7 @@ public class TrainClassStrategyImpl implements ISyncDeptStrategy {
     private R<Object> syncDept(ResourceDept resourceDept) {
         String tenantId = resourceDept.getTenantId();
         if (StrUtil.isEmpty(tenantId)) {
-            tenantId = DefaultConstants.TENANT_ID;
+            tenantId = defaultConfig.getTenantId();
             resourceDept.setTenantId(tenantId);
         }
         String otherId = resourceDept.getDept_id();

ruoyi-server/ruoyi-server-common/src/main/java/org/dromara/server/common/constant/DefaultConstants.java

@@ -63,11 +63,11 @@ public interface DefaultConstants {
     /**
      * 研究生年份父部门Id(研究生部)
      */
-    Long GRADUATE_PARENT_DEPT_ID = 118L;
+    Long GRADUATE_PARENT_DEPT_ID = 105L;
     /**
      * 培训班年份父部门Id(培训班)
      */
-    Long TRAIN_PARENT_DEPT_ID = 103L;
+    Long TRAIN_PARENT_DEPT_ID = 104L;
     /**
      * 部门类型代码
      */