diff --git a/app/custom/svc/svc_project.go b/app/custom/svc/svc_project.go index a94fd95..ff69843 100644 --- a/app/custom/svc/svc_project.go +++ b/app/custom/svc/svc_project.go @@ -106,7 +106,7 @@ func ProjectComm(c *gin.Context, args md.ProjectReq) []map[string]interface{} { } sess.Limit(utils.StrToInt(args.Size), (utils.StrToInt(args.P)-1)*utils.StrToInt(args.Size)).OrderBy(sort).Find(&data) cate := make([]models.CampTaskProjectCate, 0) - svc.MasterDb(c).Where("1=1").Find(&cate) + svc.MasterDb(c).Where("1=1").OrderBy("sort desc,id desc").Find(&cate) user, _ := svc.GetDefaultUser(c, c.GetHeader("Authorization")) instructions := svc.SysCfgGet(c, "camp_instructions") for _, v := range data { diff --git a/app/operator/svc/svc_project.go b/app/operator/svc/svc_project.go index 403a564..aed5d37 100644 --- a/app/operator/svc/svc_project.go +++ b/app/operator/svc/svc_project.go @@ -91,7 +91,7 @@ func ProjectList(c *gin.Context) { } total, _ := sess.Limit(utils.StrToInt(args.Size), (utils.StrToInt(args.P)-1)*utils.StrToInt(args.Size)).OrderBy("is_must desc,id desc").FindAndCount(&hotTaskList) cate := make([]models.CampTaskProjectCate, 0) - svc.MasterDb(c).Where("1=1").Find(&cate) + svc.MasterDb(c).Where("1=1").OrderBy("sort desc,id desc").Find(&cate) for _, v := range hotTaskList { enterpriseInfo := make(map[string]string) json.Unmarshal([]byte(v.EnterpriseInfo), &enterpriseInfo) diff --git a/app/store/svc/svc_login.go b/app/store/svc/svc_login.go index 387b9f8..4535db3 100644 --- a/app/store/svc/svc_login.go +++ b/app/store/svc/svc_login.go @@ -113,6 +113,11 @@ func Register(c *gin.Context, args md.RegisterReq) { NewCampTaskStoreUserDb := implement.NewCampTaskStoreUserDb(svc.MasterDb(c)) user, _ := NewCampTaskStoreUserDb.GetCampTaskStoreUserByPhone(args.Phone) if user == nil { + count, _ := svc.MasterDb(c).Where("phone=?", args.Phone).Count(&models.CampTaskStoreUser{}) + if count > 0 { + e.OutErr(c, 400, e.NewErr(400, "该手机号已被绑定")) + return + } user = &models.CampTaskStoreUser{ Phone: args.Phone, Password: utils.Md5(args.Password), diff --git a/app/store/svc/svc_project.go b/app/store/svc/svc_project.go index 7e35896..09fa97f 100644 --- a/app/store/svc/svc_project.go +++ b/app/store/svc/svc_project.go @@ -18,7 +18,7 @@ func AllProjectCate(c *gin.Context) { }, } cate := make([]models.CampTaskProjectCate, 0) - svc.MasterDb(c).Where("1=1").Find(&cate) + svc.MasterDb(c).Where("is_show=1").OrderBy("sort desc,id desc").Find(&cate) for _, v := range cate { tmp := map[string]string{ "name": v.Name, "value": utils.IntToStr(v.Id), @@ -44,7 +44,7 @@ func AllProjectList(c *gin.Context) { } count, _ := sess.Limit(utils.StrToInt(args.Size), (utils.StrToInt(args.P)-1)*utils.StrToInt(args.Size)).OrderBy("id desc").FindAndCount(&data) cate := make([]models.CampTaskProjectCate, 0) - svc.MasterDb(c).Where("1=1").Find(&cate) + svc.MasterDb(c).Where("1=1").OrderBy("sort desc,id desc").Find(&cate) for _, v := range data { enterpriseInfo := make(map[string]string) @@ -108,7 +108,7 @@ func ProjectList(c *gin.Context) { count, _ := sess.Limit(utils.StrToInt(args.Size), (utils.StrToInt(args.P)-1)*utils.StrToInt(args.Size)).OrderBy("id desc").FindAndCount(&data) cateList := make([]map[string]string, 0) cate := make([]models.CampTaskProjectCate, 0) - svc.MasterDb(c).Where("1=1").Find(&cate) + svc.MasterDb(c).Where("1=1").OrderBy("sort desc,id desc").Find(&cate) for _, v := range cate { tmp := map[string]string{ "name": v.Name, "value": utils.IntToStr(v.Id),