Merge branch 'dev' into pre

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

@@ -322,12 +322,16 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         //模块章列表
         if(bo.getMenuList()!=null&&bo.getMenuList().size()>0){
             if(Validator.isEmpty(bo.getCourseId())){
-                throw new CustomException("缺少课程ID");
+                CourseMenuListAddBo menuListAddBo = new CourseMenuListAddBo();
+                menuListAddBo.setGoodsId(bo.getGoodsId());
+                menuListAddBo.setMenuList(bo.getMenuList());
+                iCourseMenuService.insertByGoodsAddBo(menuListAddBo);
+            }else{
+                CourseMenuListAddBo menuListAddBo = new CourseMenuListAddBo();
+                menuListAddBo.setCourseId(bo.getCourseId());
+                menuListAddBo.setMenuList(bo.getMenuList());
+                iCourseMenuService.updateByEditBo(menuListAddBo);
             }
-            CourseMenuListAddBo menuListAddBo = new CourseMenuListAddBo();
-            menuListAddBo.setCourseId(bo.getCourseId());
-            menuListAddBo.setMenuList(bo.getMenuList());
-            iCourseMenuService.updateByEditBo(menuListAddBo);
         }
         return this.updateById(update);
     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserMockSubscribeServiceImpl.java

@@ -320,8 +320,18 @@ public class UserMockSubscribeServiceImpl extends ServiceImpl<UserMockSubscribeM
                     userMockSubscribeVos.add(userMockSubscribeVo);
                 });
             }
-
         }
+
+        Collections.sort(userMockSubscribeVos, new Comparator<UserMockSubscribeVo>() {
+            @Override
+            public int compare(UserMockSubscribeVo o1, UserMockSubscribeVo o2) {
+                //TODO: 升序排列
+                //return o1.getApplySiteExamTime().compareTo(o2.getApplySiteExamTime());
+                //TODO: 降序排列
+                return o2.getApplySiteExamTime().compareTo(o1.getApplySiteExamTime());
+            }
+        });
+
         return userMockSubscribeVos;
     }