Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/services into dev

models/message/news.go

@@ -59,14 +59,25 @@ func (m *MessageDAO) GetNewsListCount(locationid, title, orgid string) (int, err
 // GetNewsByLocation 根据位置获取咨询信息
 func (m *MessageDAO) GetNewsByLocation(locationid, orgid string) ([]model.TaCmsNews, error) {
 	var news []model.TaCmsNews
-	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("org_id=?", orgid).In("news_id", builder.Select("news_id").From("ta_cms_location").Where(builder.Eq{"location_id": locationid})).Find(&news)
+	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).
+		And("org_id=?", orgid).
+		In("news_id", builder.Select("news_id").From("ta_cms_location").Where(builder.Eq{"location_id": locationid})).
+		Desc("create_date").
+		Find(&news)
 	return news, err
 }
 
 // GetNewsByLocationShow 根据位置获取咨询信息
 func (m *MessageDAO) GetNewsByLocationShow(locationid, orgid string) ([]model.TaCmsNews, error) {
 	var news []model.TaCmsNews
-	err := m.db.Where("status = ?", models.STATUS_NORMAL).And("org_id=?", orgid).In("news_id", builder.Select("news_id").From("ta_cms_location").Where(builder.Eq{"location_id": locationid})).Find(&news)
+
+	// 2018年10月9日 yansen 默认限制 20 条
+	err := m.db.Where("status = ?", models.STATUS_NORMAL).
+		And("org_id=?", orgid).
+		In("news_id", builder.Select("news_id").From("ta_cms_location").Where(builder.Eq{"location_id": locationid})).
+		Desc("public_date").
+		Limit(20).
+		Find(&news)
 	return news, err
 }
 

service/bodycheck/bodycheck.go

@@ -97,7 +97,7 @@ func (s *BodyCheckServ) PostCheckResult(formVal map[string]interface{}) error {
 		return errors.New("获取体检信息失败")
 	}
 
-	if checkinfo == nil || checkinfo.Id != "" || time.Now().Local().Format("2006-01-02") != checkinfo.CreateDate.Format("2006-01-02") {
+	if checkinfo == nil || checkinfo.Id == "" || time.Now().Local().Format("2006-01-02") != checkinfo.CreateDate.Format("2006-01-02") {
 		caseEquipment, err := s.dao.GetCaseEquipment(result.EquipmentId)
 		if err != nil {
 			utils.LogError("获取设备信息失败：", err)