Club

app/operate/apis/org_club.go

 package apis
 
 import (
-	"fmt"
 	"strconv"
 
 	"github.com/gin-gonic/gin"
@@ -51,7 +50,8 @@ func (e OrgClub) GetPage(c *gin.Context) {
 
 	err = s.GetPage(&req, p, &list, &count)
 	if err != nil {
-		e.Error(500, err, fmt.Sprintf("获取俱乐部 失败，\r\n失败信息 %s", err.Error()))
+		e.Logger.Error(err)
+		e.Error(109, err, "未获取到数据")
 		return
 	}
 
@@ -84,7 +84,8 @@ func (e OrgClub) Get(c *gin.Context) {
 	p := actions.GetPermissionFromContext(c)
 	err = s.Get(&req, p, &object)
 	if err != nil {
-		e.Error(500, err, fmt.Sprintf("获取俱乐部失败，\r\n失败信息 %s", err.Error()))
+		e.Logger.Error(err)
+		e.Error(109, err, "未获取到数据")
 		return
 	}
 
@@ -117,12 +118,15 @@ func (e OrgClub) Insert(c *gin.Context) {
 	// 设置创建人
 	req.CreateBy = user.GetUserId(c)
 
+	// 新建俱乐部
 	err = s.Insert(&req)
 	if err != nil {
-		e.Error(500, err, fmt.Sprintf("创建俱乐部  失败，\r\n失败信息 %s", err.Error()))
+		e.Logger.Error(err)
+		e.Error(109, err, "未获取到数据")
 		return
 	}
 
+	// 新建部门
 	sSysDept := sService.SysDept{}
 	reqSysDept := sDto.SysDeptInsertReq{}
 	err = e.MakeContext(c).
@@ -138,15 +142,15 @@ func (e OrgClub) Insert(c *gin.Context) {
 	reqSysDept.DeptName = req.ClubName
 	reqSysDept.Leader = req.ClubContacts
 	reqSysDept.Status = 2
-
-	// 设置创建人
-	reqSysDept.SetCreateBy(user.GetUserId(c))
+	reqSysDept.CreateBy = user.GetUserId(c)
 	err = sSysDept.Insert(&reqSysDept)
 	if err != nil {
-		e.Error(500, err, "创建失败")
+		e.Logger.Error(err)
+		e.Error(109, err, "未获取到数据")
 		return
 	}
 
+	// 新建账户
 	sSysUser := sService.SysUser{}
 	reqSysUser := sDto.SysUserInsertReq{}
 	e.MakeContext(c).MakeOrm().MakeService(&sSysUser.Service)
@@ -164,39 +168,32 @@ func (e OrgClub) Insert(c *gin.Context) {
 	reqSysUser.Remark = "俱乐部"
 	reqSysUser.Status = "2"
 	reqSysUser.UserType = "3"
-
-	// 设置创建人
-	reqSysUser.SetCreateBy(user.GetUserId(c))
+	reqSysUser.CreateBy = user.GetUserId(c)
 	err = sSysUser.Insert(&reqSysUser)
 	if err != nil {
 		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
+		e.Error(109, err, "未获取到数据")
 		return
 	}
 
-	//关联表添加
+	// 新建俱乐部关联
 	reqClubUser := dto.OrgClubUserInsertReq{}
 	sClubUser := service.OrgClubUser{}
-	e.MakeContext(c).MakeOrm().MakeService(&sClubUser.Service)
-	errClubUser := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req).
-		MakeService(&s.Service).
-		Errors
+	errClubUser := e.MakeContext(c).MakeOrm().MakeService(&sClubUser.Service).Errors
 	if errClubUser != nil {
 		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
+		e.Error(109, err, "未获取到数据")
 		return
 	}
 
 	reqClubUser.UserId = strconv.Itoa(reqSysUser.GetId().(int))
 	reqClubUser.ClubId = strconv.Itoa(req.GetId().(int))
-	// 设置创建人
-	reqClubUser.SetCreateBy(user.GetUserId(c))
+	reqClubUser.CreateBy = user.GetUserId(c)
 
 	err = sClubUser.Insert(&reqClubUser)
 	if err != nil {
-		e.Error(500, err, fmt.Sprintf("创建俱乐部  失败，\r\n失败信息 %s", err.Error()))
+		e.Logger.Error(err)
+		e.Error(109, err, "未获取到数据")
 		return
 	}
 
@@ -231,14 +228,17 @@ func (e OrgClub) Update(c *gin.Context) {
 
 	err = s.Update(&req, p)
 	if err != nil {
-		e.Error(500, err, fmt.Sprintf("修改俱乐部 失败，\r\n失败信息 %s", err.Error()))
+		e.Logger.Error(err)
+		e.Error(109, err, "未获取到数据")
 		return
 	}
 
+	//clubId获取userId
 	sOrgClubUser := service.OrgClubUser{}
 	e.MakeContext(c).MakeOrm().MakeService(&sOrgClubUser.Service)
 	_, userId := sOrgClubUser.GetUserId(req.GetId().(int))
 
+	//修改账户信息
 	sSysUser := sService.SysUser{}
 	reqSysUser := sDto.SysUserUpdateReq{}
 	e.MakeContext(c).MakeOrm().MakeService(&sSysUser.Service)
@@ -247,13 +247,11 @@ func (e OrgClub) Update(c *gin.Context) {
 	reqSysUser.NickNameEn = req.ClubContactsEn
 	reqSysUser.Phone = req.ClubMobile
 	reqSysUser.UserId, _ = strconv.Atoi(userId)
-
-	// 设置创建人
-	reqSysUser.SetCreateBy(user.GetUserId(c))
+	reqSysUser.UpdateBy = user.GetUserId(c)
 	err = sSysUser.Update(&reqSysUser, p)
 	if err != nil {
 		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
+		e.Error(109, err, "未获取到数据")
 		return
 	}
 
@@ -282,12 +280,13 @@ func (e OrgClub) Delete(c *gin.Context) {
 		return
 	}
 
-	// req.UpdateBy = user.GetUserId(c)
+	req.UpdateBy = user.GetUserId(c)
 	p := actions.GetPermissionFromContext(c)
 
 	err = s.Remove(&req, p)
 	if err != nil {
-		e.Error(500, err, fmt.Sprintf("删除俱乐部失败，\r\n失败信息 %s", err.Error()))
+		e.Logger.Error(err)
+		e.Error(109, err, "未获取到数据")
 		return
 	}
 
@@ -299,12 +298,12 @@ func (e OrgClub) Delete(c *gin.Context) {
 	reqSysUser := sDto.SysUserById{}
 	e.MakeContext(c).MakeOrm().MakeService(&sSysUser.Service)
 	reqSysUser.Ids = userId
-	// 设置编辑人
-	reqSysUser.SetUpdateBy(user.GetUserId(c))
+	reqSysUser.UpdateBy = user.GetUserId(c)
 
 	err = sSysUser.Remove(&reqSysUser, p)
 	if err != nil {
 		e.Logger.Error(err)
+		e.Error(109, err, "未获取到数据")
 		return
 	}
 	e.OK(req.GetId(), "删除成功")

app/operate/service/dto/org_club.go

@@ -87,6 +87,7 @@ func (s *OrgClubGetReq) GetId() interface{} {
 // OrgClubDeleteReq 功能删除请求参数
 type OrgClubDeleteReq struct {
 	Ids []int `json:"ids"`
+	common.ControlBy
 }
 
 func (s *OrgClubDeleteReq) GetId() interface{} {