submit

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/impl/GoodsServiceImpl.java

@@ -5307,7 +5307,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         List<QuestionModule> modules = baseMapper.getModuleExam();
         if (CollectionUtils.isNotEmpty(modules)){
             modules.forEach(item -> {
-                Long tenantId = item.getTenantId();
+                String tenantId = item.getTenantId();
                 SysGoodsCopyRecord copyRecord = baseMapper.getSysGoodsCopy(item.getModuleExamId(),46);
                 if (ObjectUtils.isNull(copyRecord)){
                     return;
@@ -5334,7 +5334,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         List<QuestionChapter> chapters = baseMapper.getChapterExam();
         if (CollectionUtils.isNotEmpty(chapters)){
             chapters.forEach(item -> {
-                Long tenantId = item.getTenantId();
+                String tenantId = item.getTenantId();
                 SysGoodsCopyRecord copyRecord = baseMapper.getSysGoodsCopy(item.getChapterExamId(),44);
                 if (ObjectUtils.isNull(copyRecord)){
                     return;
@@ -5363,7 +5363,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         List<Exam> exam = baseMapper.getExam();
         if (CollectionUtils.isNotEmpty(exam)){
             exam.forEach(item -> {
-                Long tenantId = item.getTenantId();
+                String tenantId = item.getTenantId();
                 SysGoodsCopyRecord copyRecord = baseMapper.getSysGoodsCopy(item.getExamId(),28);
                 if (ObjectUtils.isNull(copyRecord)){
                     return;

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeUserQueryBo.java

@@ -315,7 +315,7 @@ public class ClassGradeUserQueryBo extends BaseEntity {
 	@ApiModelProperty("录单订单编号")
 	private String inputOrderSn;
 
-	private List<Long> tenantIds;
+	private List<String> tenantIds;
 
 	private List<Long> educationTypeIds;
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/mapper/ClassGradeUserMapper.java

@@ -151,10 +151,10 @@ public interface ClassGradeUserMapper extends BaseMapper<ClassGradeUser> {
     Long listUserPeriodNew_COUNT(ClassGradeUserQueryBo bo);
 
     @InterceptorIgnore(tenantLine = "true")
-    Long getEduIdByTenant(@Param("tenantId") Long tenantId,@Param("eduName") String eduName);
+    Long getEduIdByTenant(@Param("tenantId") String tenantId,@Param("eduName") String eduName);
 
     @InterceptorIgnore(tenantLine = "true")
-    Long getProIdByTenant(@Param("tenantId") Long tenantId,@Param("proName") String proName,@Param("eduId") Long eduId);
+    Long getProIdByTenant(@Param("tenantId") String tenantId,@Param("proName") String proName,@Param("eduId") Long eduId);
 
     Long listUserPeriodTotal(Integer periodStatus);
 }

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

@@ -995,7 +995,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                     .eq(SysTenant::getSevenClass, 1)
                     .eq(SysTenant::getStatus, 1));
             if (!CollectionUtils.isEmpty(sysTenants)){
-                List<Long> tenantIds = new ArrayList<>();
+                List<String> tenantIds = new ArrayList<>();
                 List<Long> educationTypeIds = new ArrayList<>();
                 List<Long> projectIds = new ArrayList<>();
                 for (SysTenant tenant : sysTenants) {
@@ -1014,7 +1014,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                 bo.setProjectIds(projectIds);
             }
         }else {
-            bo.setTenantIds(Arrays.asList(Long.valueOf(tenantId)));
+            bo.setTenantIds(Arrays.asList(tenantId));
             bo.setEducationTypeIds(Arrays.asList(bo.getEducationId()));
             bo.setProjectIds(Arrays.asList(bo.getProjectId()));
         }
@@ -1047,7 +1047,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                     .eq(SysTenant::getSevenClass, 1)
                     .eq(SysTenant::getStatus, 1));
             if (!CollectionUtils.isEmpty(sysTenants)){
-                List<Long> tenantIds = new ArrayList<>();
+                List<String> tenantIds = new ArrayList<>();
                 List<Long> educationTypeIds = new ArrayList<>();
                 List<Long> projectIds = new ArrayList<>();
                 for (SysTenant tenant : sysTenants) {
@@ -1066,7 +1066,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                 bo.setProjectIds(projectIds);
             }
         }else {
-            bo.setTenantIds(Arrays.asList(Long.valueOf(tenantId)));
+            bo.setTenantIds(Arrays.asList(tenantId));
             bo.setEducationTypeIds(Arrays.asList(bo.getEducationId()));
             bo.setProjectIds(Arrays.asList(bo.getProjectId()));
         }