MERGE

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/UserPeriodServiceImpl.java

@@ -66,7 +66,9 @@ import com.zhongzheng.modules.order.domain.OrderGoods;
 import com.zhongzheng.modules.order.service.IOrderGoodsService;
 import com.zhongzheng.modules.order.service.IOrderService;
 import com.zhongzheng.modules.system.domain.SysOldOrg;
+import com.zhongzheng.modules.system.domain.SysTenant;
 import com.zhongzheng.modules.system.service.ISysOldOrgService;
+import com.zhongzheng.modules.system.service.ISysTenantService;
 import com.zhongzheng.modules.user.bo.UserStudyRecordQueryBo;
 import com.zhongzheng.modules.user.domain.User;
 import com.zhongzheng.modules.user.domain.UserExamGoods;
@@ -203,6 +205,9 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
     @Autowired
     private ICourseModuleService iCourseModuleService;
 
+    @Autowired
+    private ISysTenantService iSysTenantService;
+
     @Value("${oldStudySys.syncPath}")
     private String SYNC_PATH;
 
@@ -682,11 +687,16 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
                     return true;
                 }
             }
-            if(Validator.isNotEmpty(business7)&&"七大员".equals(business7.getBusinessName())){
+//            if(Validator.isNotEmpty(business7)&&"七大员".equals(business7.getBusinessName())){
+//                hasSeven = true;
+//                studyRec.setCourseType(17);
+//                //去掉七大员推送
+//                return true;
+//            }
+            SysTenant sysTenant = iSysTenantService.getById(Long.valueOf(tenant));
+            if (ObjectUtils.isNotNull(sysTenant) && sysTenant.getPeriodSign() == 1){
                 hasSeven = true;
                 studyRec.setCourseType(17);
-                //去掉七大员推送
-                return true;
             }
         }
         UserVo userVo = iUserService.queryById(bo.getUserId());

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/domain/SysTenant.java

@@ -113,5 +113,6 @@ private static final long serialVersionUID=1L;
     private Integer sevenClass;
     /** 考场共享标识: 1使用祥粤 0正常 */
     private Integer examRoom;
-
+    /** 新考学时推送标识：1推送旧系统 0正常 */
+    private Integer periodSign;
 }