fix

zhongzheng-framework/src/main/java/com/zhongzheng/framework/mybatisplus/CustomTenantLineInnerInterceptor.java

@@ -29,7 +29,7 @@ public class CustomTenantLineInnerInterceptor extends TenantLineInnerInterceptor
     protected Expression builderExpression(Expression currentExpression, Table table) {
         Column aliasColumn = this.getAliasColumn(table);
         boolean presenceOfField=true;
-        if(presenceOfField) {
+        if(!this.tenantLineHandler.ignoreTable(table.getName())) {
             FindInSetExpression findInSetExpression = new FindInSetExpression();
             findInSetExpression.setLeftExpression(getTenantLineHandler().getTenantId());
             findInSetExpression.setRightExpression(aliasColumn);

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/Major.java

@@ -46,7 +46,7 @@ private static final long serialVersionUID=1L;
     private String encoder;
     /** 排序 */
     private Integer sort;
-    private Long tenantId;
+    private String tenantId;
     @TableField(exist = false)
     private Long oId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/impl/DistributionActivityGoodsServiceImpl.java

@@ -583,7 +583,7 @@ public class DistributionActivityGoodsServiceImpl extends ServiceImpl<Distributi
     }
 
     @Override
-    
+
     public void saveBatchEntity(List<DistributionActivityGoods> activityGoodsList) {
         saveBatch(activityGoodsList);
     }
@@ -1241,7 +1241,7 @@ public class DistributionActivityGoodsServiceImpl extends ServiceImpl<Distributi
         if (ObjectUtil.isNull(newMajorId)) {
             //新增专业
             major.setId(null);
-            major.setTenantId(newTenantId);
+            major.setTenantId(newTenantId.toString());
             iMajorService.save(major);
             newMajorId = major.getId();
             addSysGoodsRecord(oid, major.getId(), GoodsCopyEnum.MAJOR.getType(), newTenantId);

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

@@ -3181,7 +3181,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         if (ObjectUtil.isNull(newMajorId)){
             //新增专业
             major.setId(null);
-            major.setTenantId(newTenantId);
+            major.setTenantId(newTenantId.toString());
             iMajorService.save(major);
             newMajorId = major.getId();
             addSysGoodsRecord(oid,major.getId(),GoodsCopyEnum.MAJOR.getType(),newTenantId,array);
@@ -3851,7 +3851,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
             List<Major> newMajorList = majorList.stream().map(x -> {
                 Major major = BeanUtil.toBean(x, Major.class);
                 major.setId(null);
-                major.setTenantId(newTenantId);
+                major.setTenantId(newTenantId.toString());
                 major.setOId(x.getId());
                 return major;
             }).collect(Collectors.toList());

zhongzheng-system/src/main/resources/mapper/modules/course/CourseMapper.xml

@@ -666,7 +666,7 @@
             AND (SELECT cgu.period_wait_time FROM class_grade_user cgu  where cgu.`status`=1  and cgu.grade_id = og.grade_id and cgu.user_id = o.user_id and cgu.order_goods_id = og.order_goods_id) >0
         </if>
         <if test="studyFinishStatus != null and studyFinishStatus == 2">
-            AND (SELECT cgu.period_wait_time FROM class_grade_user cgu  where cgu.`status`=1  and cgu.grade_id = og.grade_id and cgu.user_id = o.user_id and cgu.order_goods_id = og.order_goods_id) is null 
+            AND (SELECT cgu.period_wait_time FROM class_grade_user cgu  where cgu.`status`=1  and cgu.grade_id = og.grade_id and cgu.user_id = o.user_id and cgu.order_goods_id = og.order_goods_id) is null
         </if>
         order by og.create_time desc
     </select>