submit

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

@@ -333,7 +333,7 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
                     add.setSevenCode(sevenCode);
                 }
             }
-            else if (("继续教育二级建造师".equals(businessName)) || ("继续教育二级造价师".equals(businessName))){
+            else if (("继续教育二级建造师".equals(businessName)|| ("继续教育二级造价师".equals(businessName))) && sysTenant.getShareClass() == 1){
                 erJfalg = true;
                 ezJfalg = "继续教育二级造价师".equals(businessName);
                 if (ObjectUtils.isNotNull(bo.getClassStatus()) && bo.getClassStatus() == 0){

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

@@ -415,7 +415,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                             .eq(TopOldOrderGoods::getStatus, 1));
                     if (CollectionUtils.isNotEmpty(list)){
                         for (TopOldOrderGoods orderGoods : list) {
-                            String substring = orderGoods.getBusinessFullName().substring(5, 8);
+                            String substring = orderGoods.getBusinessFullName().substring(4, 8);
                             String format = String.format("%s-%s", substring, orderGoods.getBusinessName());
                             businessNames.add(format);
                         }
@@ -1359,10 +1359,6 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
         return list;
     }
 
-    public static void main(String[] args) {
-        System.out.println(EncryptHandler.decrypt("21bac9a89b8500cbad449f1e0644cf4fdcf042e4c2933c31a2a602da0d0f5f77"));
-    }
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean checkOrder(TopOldOrderCheckBo bo) {