feats

models/cases/area.go

@@ -21,7 +21,7 @@ func (m *CaseDAO) GetCaseAreaCount(caseids string) (int, error) {
 func (m *CaseDAO) GetCaseArea(caseids string, page int, pageSize int) ([]model.SysCaseArea, error) {
 	var areas []model.SysCaseArea
 	dao := m.db.Where("status>" + strconv.Itoa(models.STATUS_DEL)).And("case_id in ('" + strings.Replace(caseids, ",", "','", -1) + "')")
-	err := dao.Limit(pageSize, page*pageSize).Find(&areas)
+	err := dao.Limit(pageSize, (page-1)*pageSize).Find(&areas)
 	return areas, err
 }
 

models/cases/cases.go

@@ -27,20 +27,21 @@ func NewCaseDAO(ctx *utils.Context) *CaseDAO {
 
 // CaseInfo 案场
 type CaseInfo struct {
-	model.TaCmsCase `xorm:"extends"`
-	CreateUserName  string
+	model.SysCase  `xorm:"extends"`
+	CreateUserName string
 }
 
 // GetCaseList 获取案场列表
 func (m *CaseDAO) GetCaseList(caseids, casename string, page, pageSize int) ([]CaseInfo, error) {
 	var cases []CaseInfo
-	sql := `select a.*,b.user_name as create_user_name from sys_case a inner join sys_user b on a.create_user = b.user_id
+	sql := `select a.*,b.user_name as create_user_name from sys_case a left join sys_user b on a.create_user = b.user_id
 	 where a.status>` + strconv.Itoa(models.STATUS_DEL) + ` and a.case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `')`
 	if casename != "" {
 		sql = sql + ` and  a.case_name like '%` + casename + `%'`
 	}
 
-	sql = sql + " order by create_date desc limit " + strconv.Itoa(page*pageSize) + ", " + strconv.Itoa((page+1)*pageSize)
+	sql = sql + " order by create_date desc limit " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa((page+1)*pageSize)
+
 	err := m.db.Sql(sql).Find(&cases)
 	return cases, err
 }

models/cases/equipment.go

@@ -11,7 +11,7 @@ import (
 // GetEquipmentList 获取体检设备
 func (m *CaseDAO) GetEquipmentList(caseids string, page, pageSize int) ([]model.SysCaseEquipment, error) {
 	var equipments []model.SysCaseEquipment
-	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("case_id in ('"+strings.Replace(caseids, ",", "','", -1)+"')").Limit(pageSize, page*pageSize).Find(&equipments)
+	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("case_id in ('"+strings.Replace(caseids, ",", "','", -1)+"')").Limit(pageSize, (page-1)*pageSize).Find(&equipments)
 	return equipments, err
 }
 

models/course/course.go

@@ -27,7 +27,7 @@ func NewCourseDAO(ctx *utils.Context) *CourseDAO {
 func (m *CourseDAO) GetCourseList(caseids, name, typeid string, page, pageSize int) ([]model.TaCourse, error) {
 	var courses []model.TaCourse
 
-	m.db.Where("status>" + strconv.Itoa(models.STATUS_DEL))
+	m.db.Where("status>" + strconv.Itoa(models.STATUS_DEL)).And("")
 
 	return courses, nil
 }

models/course/tag.go

@@ -11,7 +11,7 @@ import (
 // GetTagsList 获取标签列表
 func (m *CourseDAO) GetTagsList(orgid string, page, pageSize int) ([]model.TdCourseTag, error) {
 	var tags []model.TdCourseTag
-	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("org_id=?", orgid).Desc("create_date").Limit(pageSize, page*pageSize).Find(&tags)
+	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("org_id=?", orgid).Desc("create_date").Limit(pageSize, (page-1)*pageSize).Find(&tags)
 	return tags, err
 }
 

models/goods/spec.go

@@ -18,7 +18,7 @@ func (m *GoodsDAO) GetGoodsSpecCount(caseids string) (int, error) {
 // GetGoodsSpec 根据案场获取商品规格
 func (m *GoodsDAO) GetGoodsSpec(caseids string, page int, pageSize int) ([]model.TdSpec, error) {
 	var goodsSpec []model.TdSpec
-	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("case_id in ('"+strings.Replace(caseids, ",", "','", -1)+"')").Limit(pageSize, page*pageSize).Find(&goodsSpec)
+	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("case_id in ('"+strings.Replace(caseids, ",", "','", -1)+"')").Limit(pageSize, (page-1)*pageSize).Find(&goodsSpec)
 	return goodsSpec, err
 }
 

models/goods/type.go

@@ -19,7 +19,7 @@ func (m *GoodsDAO) GetGoodsTypeCount(caseids string) (int, error) {
 // GetGoodsType 根据案场获取商品类型
 func (m *GoodsDAO) GetGoodsType(caseids string, page int, pageSize int) ([]model.TdGoodsType, error) {
 	var goodstype []model.TdGoodsType
-	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("case_id in ('"+strings.Replace(caseids, ",", "','", -1)+"')").Limit(pageSize, page*pageSize).Desc("create_date").Find(&goodstype)
+	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("case_id in ('"+strings.Replace(caseids, ",", "','", -1)+"')").Limit(pageSize, (page-1)*pageSize).Desc("create_date").Find(&goodstype)
 	return goodstype, err
 }
 

models/message/cmscase.go

@@ -23,7 +23,7 @@ func (m *MessageDAO) GetCmsCaseList(name, caseids string, page int, pageSize int
 	sql := `select a.*,b.case_name from ta_cms_case a inner join sys_case b on a.case_id = b.case_id 
 	where a.case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `') and a.name like '%` + name + `%' and a.status > ` + strconv.Itoa(models.STATUS_DEL) + `
 	and b.status > ` + strconv.Itoa(models.STATUS_DEL) + `
-	order by create_date desc limit ` + strconv.Itoa(page*pageSize) + `, ` + strconv.Itoa((page+1)*pageSize)
+	order by create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa((page+1)*pageSize)
 
 	err := m.db.Sql(sql).Find(&cases)
 	return cases, err

models/message/image.go

@@ -11,7 +11,7 @@ import (
 // GetImgList 获取轮播图列表
 func (m *MessageDAO) GetImgList(orgid string, page int, pageSize int) ([]model.TaCmsImages, error) {
 	var imgs []model.TaCmsImages
-	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("org_id=?", orgid).Limit(pageSize, page*pageSize).Desc("create_date").Find(&imgs)
+	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("org_id=?", orgid).Limit(pageSize, (page-1)*pageSize).Desc("create_date").Find(&imgs)
 	return imgs, err
 }
 
@@ -62,8 +62,8 @@ func (m *MessageDAO) UpdateCmsImg(img model.TaCmsImages) error {
 	var cols = []string{
 		"image_url",
 		"forward_type",
-		"foward_url",
-		"foward_resource_id",
+		"forward_url",
+		"forward_resource_id",
 		"sort",
 		"title",
 	}

models/message/message.go

@@ -33,7 +33,7 @@ func (m *MessageDAO) GetCmsInfoList(title, orgid string, page int, pageSize int)
 		dao.And("info_name like '%" + title + "%'")
 	}
 
-	err := dao.Limit(pageSize, page*pageSize).Desc("create_date").Find(&cmsinfos)
+	err := dao.Limit(pageSize, (page-1)*pageSize).Desc("create_date").Find(&cmsinfos)
 	return cmsinfos, err
 }
 

models/message/news.go

@@ -31,7 +31,7 @@ func (m *MessageDAO) GetNewsList(locationid, orgid string, page int, pageSize in
 		sql += ` and new.news_id in (select news_id from ta_cms_location where location_id='` + locationid + `')`
 	}
 
-	sql = sql + " order by new.create_date desc limit " + strconv.Itoa(page*pageSize) + ", " + strconv.Itoa((page+1)*pageSize)
+	sql = sql + " order by new.create_date desc limit " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa((page+1)*pageSize)
 
 	err := m.db.Sql(sql).Find(&news)
 	return news, err

models/system/role.go

@@ -35,7 +35,7 @@ func (m *RoleDAO) GetRoleCount(caseids string) (int, error) {
 // GetRoleList 根据案场获取角色
 func (m *RoleDAO) GetRoleList(caseids string, page int, pageSize int) ([]model.SysRole, error) {
 	var roles []model.SysRole
-	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("case_id in ('"+strings.Replace(caseids, ",", "','", -1)+"')").Limit(pageSize, page*pageSize).Desc("create_date").Find(&roles)
+	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("case_id in ('"+strings.Replace(caseids, ",", "','", -1)+"')").Limit(pageSize, (page-1)*pageSize).Desc("create_date").Find(&roles)
 	return roles, err
 }
 

models/system/user.go

@@ -47,7 +47,7 @@ func (m *UserDAO) GetUserList(username, typeid, caseids string, page int, pageSi
 		sql = sql + " and user_id in (select user_id from sys_user_type where type_id = '" + typeid + "')"
 	}
 
-	sql = sql + " order by create_date desc limit " + strconv.Itoa(page*pageSize) + ", " + strconv.Itoa((page+1)*pageSize)
+	sql = sql + " order by create_date desc limit " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa((page+1)*pageSize)
 
 	err := m.db.Sql(sql).Find(&users)
 	return users, err
@@ -59,7 +59,7 @@ func (m *UserDAO) GetUserList(username, typeid, caseids string, page int, pageSi
 	// if typeid != "" {
 	// 	userDAO.In("user_id", builder.Select("user_id").From("sys_user_type").Where(builder.Eq{"type_id": typeid}))
 	// }
-	// err := userDAO.Limit(pageSize, page*pageSize).Desc("create_date").Find(&users)
+	// err := userDAO.Limit(pageSize, (page-1)*pageSize).Desc("create_date").Find(&users)
 	// return users, err
 }
 
@@ -326,7 +326,7 @@ func (m *UserDAO) UpdateCustomerHeadImg(customerid, username, imgurl string) err
 // GetUserCustomer 获取我的推荐客户
 func (m *UserDAO) GetUserCustomer(userid string, page int, pageSize int) ([]model.TaCustomer, error) {
 	var customers []model.TaCustomer
-	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("recommend_id=?", userid).Limit(pageSize, page*pageSize).Desc("create_date").Find(&customers)
+	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("recommend_id=?", userid).Limit(pageSize, (page-1)*pageSize).Desc("create_date").Find(&customers)
 	return customers, err
 }
 

service/cases/area.go

@@ -11,6 +11,9 @@ func (s *CaseServ) GetCaseArea(caseids string, page int, pageSize int) (map[stri
 	if pageSize == 0 {
 		pageSize = service.PAGENUM
 	}
+	if page == 0 {
+		page = 1
+	}
 	areas, err := s.dao.GetCaseArea(caseids, page, pageSize)
 	if err != nil {
 		return nil, err

service/cases/cases.go

@@ -26,6 +26,9 @@ func (s *CaseServ) GetCases(caseids, casename string, page, pageSize int) (map[s
 	if pageSize == 0 {
 		pageSize = service.PAGENUM
 	}
+	if page == 0 {
+		page = 1
+	}
 	cases, err := s.dao.GetCaseList(caseids, casename, page, pageSize)
 	if err != nil {
 		return nil, err

service/cases/equipment.go

@@ -10,6 +10,9 @@ func (s *CaseServ) GetCaseEquipment(caseids string, page int, pageSize int) (map
 	if pageSize == 0 {
 		pageSize = service.PAGENUM
 	}
+	if page == 0 {
+		page = 1
+	}
 	specs, err := s.dao.GetEquipmentList(caseids, page, pageSize)
 	if err != nil {
 		return nil, err

service/cases/table.go

@@ -10,6 +10,9 @@ func (s *CaseServ) GetCaseTable(caseids string, page int, pageSize int) (map[str
 	if pageSize == 0 {
 		pageSize = service.PAGENUM
 	}
+	if page == 0 {
+		page = 1
+	}
 	areas, err := s.dao.GetCaseTable(caseids, page, pageSize)
 	if err != nil {
 		return nil, err

service/cases/tag.go

@@ -11,6 +11,9 @@ func (s *CaseServ) GetTagList(caseids string, page, pageSize int) (map[string]in
 	if pageSize == 0 {
 		pageSize = service.PAGENUM
 	}
+	if page == 0 {
+		page = 1
+	}
 	tags, err := s.dao.GetTagList(caseids, page, pageSize)
 	if err != nil {
 		return nil, err

service/course/tag.go

@@ -10,6 +10,9 @@ func (s *CourseServ) GetTagsList(orgid string, page, pageSize int) (map[string]i
 	if pageSize == 0 {
 		pageSize = service.PAGENUM
 	}
+	if page == 0 {
+		page = 1
+	}
 	tags, err := s.dao.GetTagsList(orgid, page, pageSize)
 	if err != nil {
 		return nil, err

service/goods/spec.go

@@ -1,6 +1,7 @@
 package goods
 
 import (
+	"errors"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/service"
 )
@@ -10,6 +11,9 @@ func (s *GoodsServ) GetGoodsSpec(caseids string, page int, pageSize int) (map[st
 	if pageSize == 0 {
 		pageSize = service.PAGENUM
 	}
+	if page == 0 {
+		page = 1
+	}
 	specs, err := s.dao.GetGoodsSpec(caseids, page, pageSize)
 	if err != nil {
 		return nil, err
@@ -35,6 +39,13 @@ func (s *GoodsServ) GetGoodsSpecByID(specid string) (*model.TdSpec, error) {
 
 // SaveGoodsSpec 保存商品类型
 func (s *GoodsServ) SaveGoodsSpec(goodsSpec model.TdSpec) (*model.TdSpec, error) {
+	if goodsSpec.SpecName == "" {
+		return nil, errors.New("规格名称不能为空！")
+	}
+
+	if goodsSpec.CaseId == "" {
+		return nil, errors.New("案场不能为空！")
+	}
 	var err error
 	if goodsSpec.SpecId == "" {
 		_, err = s.dao.AddGoodsSpec(&goodsSpec)

service/goods/type.go

@@ -1,6 +1,7 @@
 package goods
 
 import (
+	"errors"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/service"
 )
@@ -10,6 +11,9 @@ func (s *GoodsServ) GetGoodsType(caseids string, page int, pageSize int) (map[st
 	if pageSize == 0 {
 		pageSize = service.PAGENUM
 	}
+	if page == 0 {
+		page = 1
+	}
 	types, err := s.dao.GetGoodsType(caseids, page, pageSize)
 	if err != nil {
 		return nil, err
@@ -35,6 +39,14 @@ func (s *GoodsServ) GetGoodsTypeByID(typeid string) (*model.TdGoodsType, error)
 
 // SaveGoodsType 保存商品类型
 func (s *GoodsServ) SaveGoodsType(goodsType model.TdGoodsType) (*model.TdGoodsType, error) {
+	if goodsType.TypeName == "" {
+		return nil, errors.New("类型名称不能为空！")
+	}
+
+	if goodsType.CaseId == "" {
+		return nil, errors.New("案场不能为空！")
+	}
+
 	var err error
 	if goodsType.TypeId == "" {
 		_, err = s.dao.AddGoodsType(&goodsType)

service/message/cmscase.go

@@ -13,6 +13,9 @@ func (s *MessageServ) GetCmsCasesList(name, orgid string, page int, pageSize int
 	if pageSize == 0 {
 		pageSize = service.PAGENUM
 	}
+	if page == 0 {
+		page = 1
+	}
 	infos, err := s.dao.GetCmsCaseList(name, orgid, page, pageSize)
 	if err != nil {
 		return nil, err

service/message/image.go

@@ -1,15 +1,24 @@
 package message
 
 import (
+	"errors"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/service"
 )
 
+const (
+	ForwardTypeUrl    = "url"
+	ForwardTypeCourse = "course"
+)
+
 // GetImgList 获取图片列表
 func (s *MessageServ) GetImgList(orgid string, page int, pageSize int) (map[string]interface{}, error) {
 	if pageSize == 0 {
 		pageSize = service.PAGENUM
 	}
+	if page == 0 {
+		page = 1
+	}
 	infos, err := s.dao.GetImgList(orgid, page, pageSize)
 	if err != nil {
 		return nil, err
@@ -41,6 +50,21 @@ func (s *MessageServ) GetImgByID(imgid string) (*model.TaCmsImages, error) {
 
 // SaveImg 保存轮播图信息
 func (s *MessageServ) SaveImg(imginfo model.TaCmsImages) (*model.TaCmsImages, error) {
+	if imginfo.ImageUrl == "" {
+		return nil, errors.New("图片不允许为空！")
+	}
+
+	if imginfo.ForwardType == "" {
+		return nil, errors.New("跳转类型不允许为空！")
+	}
+	if imginfo.ForwardType == ForwardTypeUrl && imginfo.ForwardUrl == "" {
+		return nil, errors.New("跳转地址不允许为空！")
+	}
+
+	if imginfo.ForwardType == ForwardTypeCourse && imginfo.CaseId == "" {
+		return nil, errors.New("跳转资源不允许为空！")
+	}
+
 	if imginfo.ImageId == "" {
 		newinfo, err := s.dao.AddCmsImg(imginfo)
 		return newinfo, err

service/message/message.go

@@ -26,6 +26,9 @@ func (s *MessageServ) GetCmsInfoList(title, orgid string, page int, pageSize int
 	if pageSize == 0 {
 		pageSize = service.PAGENUM
 	}
+	if page == 0 {
+		page = 1
+	}
 	infos, err := s.dao.GetCmsInfoList(title, orgid, page, pageSize)
 	if err != nil {
 		return nil, err

service/message/news.go

@@ -11,6 +11,9 @@ func (s *MessageServ) GetNewsList(locationid, orgid string, page int, pageSize i
 	if pageSize == 0 {
 		pageSize = service.PAGENUM
 	}
+	if page == 0 {
+		page = 1
+	}
 	infos, err := s.dao.GetNewsList(locationid, orgid, page, pageSize)
 	if err != nil {
 		return nil, err

service/system/role.go

@@ -26,6 +26,9 @@ func (s *RoleServ) GetRoleList(caseids string, page, pageSize int) (map[string]i
 	if pageSize == 0 {
 		pageSize = service.PAGENUM
 	}
+	if page == 0 {
+		page = 1
+	}
 	roles, err := s.dao.GetRoleList(caseids, page, pageSize)
 	if err != nil {
 		return nil, err

service/user.go

@@ -32,6 +32,9 @@ func (s *UserServ) GetUserList(username, typeid, caseids string, page int, pageS
 	if pageSize == 0 {
 		pageSize = PAGENUM
 	}
+	if page == 0 {
+		page = 1
+	}
 	userList, err := s.dao.GetUserList(username, typeid, caseids, page, pageSize)
 	if err != nil {
 		return nil, err
@@ -266,6 +269,9 @@ func (s *UserServ) GetUserCustomer(userid string, page int, pageSize int) ([]mod
 	if pageSize == 0 {
 		pageSize = PAGENUM
 	}
+	if page == 0 {
+		page = 1
+	}
 	customers, err := s.dao.GetUserCustomer(userid, page, pageSize)
 	return customers, err
 }