培训/演练 代码提交

project_data/sql/0.0.3/升级说明.txt

@@ -0,0 +1,11 @@
+
+nacos-中feign配置修改
+1、
+  compression:
+    request:
+      enabled: false
+      min-request-size: 8192
+    response:
+      enabled: false
+2、
+file模块：添加redis连接信息配置

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/impl/CoreDrillPlanServiceImpl.java

@@ -271,8 +271,8 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
             doUpdatePlan(plan, request);
             return;
         }
-        final SysOrg sysOrg = orgService.selectTopOrg(SecurityConstants.INNER);
-        if (plan.getStandard() == 1 && ObjectUtil.equal(plan.getCreateOrgId(), sysOrg.getId())) {
+      /*  final SysOrg sysOrg = orgService.selectTopOrg(SecurityConstants.INNER);*/
+        if (plan.getStandard() == 1) {
             //标准计划 且是省联社创建的
             updateStandardPlan(plan, request, range);
         } else {
@@ -589,6 +589,9 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
             List<Long> collect = planList.stream().map(CoreDrillPlan::getId).collect(Collectors.toList());
             coreDrillPlanMapper.updatePlanStatusByIdList(collect, EduTrainingPlanStatus.USING.getCode());
         }
+        if (checkOrgType(plan.getExecOrgType())){
+            planList.add(plan);
+        }
         //下发后修改为使用中
         plan.setPlanStatus(DrillPlanStatus.USING.getCode());
         plan.setIssue(1);
@@ -693,6 +696,9 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
         List<CoreDrillPlanToExecOrg> planToExecOrgs = new ArrayList<>();
         List<CoreDrillPlan> list = new ArrayList<>();
         for (SysOrgVO sysOrg : publishOrgList) {
+            if (checkOrgType(plan.getExecOrgType())){
+                continue;
+            }
             CoreDrillPlan drillPlan = new CoreDrillPlan();
             BeanUtils.copyProperties(plan, drillPlan);
             drillPlan.setId(IdWorker.getId());

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/CoreEduTrainingPlanServiceImpl.java

@@ -265,7 +265,7 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
             doUpdatePlan(plan, request);
         }
         final SysOrg sysOrg = orgService.selectTopOrg(SecurityConstants.INNER);
-        if (plan.getStandard() == 1 && ObjectUtil.equal(plan.getCreateOrgId(), sysOrg.getId())) {
+        if (plan.getStandard() == 1) {
             //标准计划 且是省联社创建的
             updateStandardPlan(plan, request, range);
         } else {
@@ -620,6 +620,9 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
             List<Long> collect = planList.stream().map(CoreEduTrainingPlan::getId).collect(Collectors.toList());
             coreEduTrainingPlanMapper.updatePlanStatusByIdList(collect, EduTrainingPlanStatus.USING.getCode());
         }
+        if (checkOrgType(plan.getExecOrgType())){
+            planList.add(plan);
+        }
         //下发后修改为使用中
         plan.setPlanStatus(EduTrainingPlanStatus.USING.getCode());
         plan.setIssue(1);
@@ -676,6 +679,9 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
         List<CoreEduTrainingPlanToExecOrg> planToExecOrgs = new ArrayList<>();
         List<CoreEduTrainingPlan> list = new ArrayList<>();
         for (SysOrgVO sysOrg : planPublishOrgList) {
+            if (checkOrgType(plan.getExecOrgType())){
+                continue;
+            }
             CoreEduTrainingPlan coreEduTrainingPlan = new CoreEduTrainingPlan();
             BeanUtils.copyProperties(plan, coreEduTrainingPlan);
             coreEduTrainingPlan.setId(IdWorker.getId());