Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/java/com/ym/mec/biz/service/VipGroupDefaultClassesCycleService.java

@@ -7,6 +7,6 @@ import java.util.List;
 
 public interface VipGroupDefaultClassesCycleService extends BaseService<Integer, VipGroupDefaultClassesCycle> {
 
-    List<VipGroupDefaultClassesCycle> findAllByOrgan(Long organId);
+    List<VipGroupDefaultClassesCycle> findAllCycle();
 
-}
+}

mec-biz/src/main/java/com/ym/mec/biz/service/impl/VipGroupDefaultClassesCycleServiceImpl.java

@@ -45,8 +45,8 @@ public class VipGroupDefaultClassesCycleServiceImpl extends BaseServiceImpl<Inte
 	}
 
 	@Override
-	public List<VipGroupDefaultClassesCycle> findAllByOrgan(Long organId) {
-		return vipGroupDefaultClassesCycleDao.findAllByOrgan(organId);
+	public List<VipGroupDefaultClassesCycle> findAllCycle() {
+		return vipGroupDefaultClassesCycleDao.findAllCycle();
 	}
 
 	@Override

mec-biz/src/main/resources/config/mybatis/VipGroupActivityMapper.xml

@@ -131,7 +131,7 @@
 	<select id="queryPage" resultMap="VipGroupActivity" parameterType="map">
 		SELECT
 		vga.*,
-		(NOW() &lt; end_time_ AND NOW() > start_time_) enable,
+		((NOW() &lt; end_time_ AND NOW() > start_time_) OR end_time_ IS NULL) enable,
 		GROUP_CONCAT(vgc.name_) vip_group_category_names_
 		FROM vip_group_activity vga
 		LEFT JOIN vip_group_category vgc ON FIND_IN_SET(vgc.id_,vga.vip_group_category_id_list_)
@@ -153,7 +153,7 @@
 			vip_group_activity
 		WHERE
 			FIND_IN_SET( #{categoryId}, vip_group_category_id_list_ )
-			AND NOW() &lt; end_time_
+			AND (NOW() &lt; end_time_ OR end_time_ IS NULL)
 			AND del_flag_=0
 	</select>
     <select id="queryNamesById" resultType="java.util.Map">

mec-web/src/main/java/com/ym/mec/web/controller/VipGroupDefaultClassesCycleController.java

@@ -34,8 +34,8 @@ public class VipGroupDefaultClassesCycleController extends BaseController {
 	@ApiOperation("全查询")
 	@GetMapping(value = "/queryAll")
     @PreAuthorize("@pcs.hasPermissions('vipGroupDefaultClassesCycle/queryAll')")
-	public Object queryAll(Long organId) {
-		return succeed(vipGroupDefaultClassesCycleService.findAllByOrgan(organId));
+	public Object queryAll() {
+		return succeed(vipGroupDefaultClassesCycleService.findAllCycle());
 	}
 
 	@ApiOperation("新增")