update

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/VipGroup.java

@@ -67,7 +67,7 @@ public class VipGroup {
 	private BigDecimal offlineClassesUnitPrice;
 
 	@ApiModelProperty(value = "课程总价",required = false)
-	private BigDecimal totalPrice;
+	private BigDecimal totalPrice = new BigDecimal(0);
 
 	@ApiModelProperty(value = "审批状态",required = false)
 	private AuditStatusEnum auditStatus;

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

@@ -3,6 +3,7 @@ package com.ym.mec.web.controller;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
@@ -30,22 +31,22 @@ public class IndexController extends BaseController {
 
 	@Autowired
 	private MusicGroupDao musicGroupDao;
-	
+
 	@Autowired
 	private TeacherDao teacherDao;
-	
+
 	@Autowired
 	private StudentRegistrationDao studentRegistrationDao;
-	
+
 	@Autowired
 	private VipGroupDao vipGroupDao;
-	
+
 	@Autowired
 	private DemoGroupDao demoGroupDao;
 
 	@Autowired
 	private SysUserFeignService sysUserFeignService;
-	
+
 	@Autowired
 	private SysUserCashAccountDetailDao sysUserCashAccountDetailDao;
 
@@ -61,28 +62,36 @@ public class IndexController extends BaseController {
 		String organId = sysUser.getOrganId();
 		if (sysUser.getIsSuperAdmin()) {
 			organId = null;
-		}else if(StringUtils.isEmpty(organId)){
+		} else if (StringUtils.isEmpty(organId)) {
 			return failed(HttpStatus.INTERNAL_SERVER_ERROR, "分部信息错误");
 		}
 
 		Map<String, Integer> musicDatas = musicGroupDao.queryOrganMusicGroupNum(organId);
-		
+
 		Map<String, Integer> teacherDatas = teacherDao.queryOrganTeacherNum(organId);
-		
+
 		Map<String, Integer> studentDatas = studentRegistrationDao.queryStudentNum(organId);
-		
+
 		Map<String, Integer> vipDatas = vipGroupDao.queryVipGroupNum(organId);
-		
-		Map<String, Integer> demoDatas = demoGroupDao.queryDemoGroupNum(organId.split(","));
-		
+
+		Map<String, Integer> demoDatas = new HashMap<String, Integer>();
+
+		Integer demoGroupNum = 0;
+
+		if (StringUtils.isBlank(organId)) {
+			demoDatas = demoGroupDao.queryDemoGroupNum(null);
+			demoGroupNum = demoGroupDao.queryCurrentMonthCoursesNum(null);
+		} else {
+			demoDatas = demoGroupDao.queryDemoGroupNum(organId.split(","));
+			demoGroupNum = demoGroupDao.queryCurrentMonthCoursesNum(organId.split(","));
+		}
+
 		Integer musicGroupNum = musicGroupDao.queryCurrentMonthCoursesNum(organId);
-		
+
 		Integer vipGroupNum = vipGroupDao.queryCurrentMonthCoursesNum(organId);
-		
-		Integer demoGroupNum = demoGroupDao.queryCurrentMonthCoursesNum(organId.split(","));
-		
+
 		Map<String, Object> incomeExpendMap = sysUserCashAccountDetailDao.queryStatistics(organId);
-		
+
 		ModelMap model = new ModelMap();
 		model.put("musicDatas", musicDatas);
 		model.put("teacherDatas", teacherDatas);