Sfoglia il codice sorgente

新增操作返回id

hongzhenyue 4 anni fa
parent
commit
ef3275f618

+ 6 - 13
controllers/partial/SysAppController.go

@@ -3,6 +3,7 @@ package partial
 import (
 	"fmt"
 	"git.qianqiusoft.com/qianqiusoft/light-apiengine/entitys"
+	"strings"
 	"time"
 
 	//sysmodel "git.qianqiusoft.com/qianqiusoft/light-apiengine/models"
@@ -48,7 +49,7 @@ func SysApp_AddAppFun(c *entitys.CtrlContext) {
 	_, err = c.Db.SqlMapClient("insert_sys_app_fun", paramMap).Execute()
 
 	if err == nil {
-		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
+		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", paramObj0.Id})
 	} else {
 		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
 	}
@@ -189,6 +190,7 @@ func SysApp_AddRoleAppFun(c *entitys.CtrlContext) {
 	}
 
 	var roleAppFuns []*sysmodel.SysRoleAppFun
+	ids := make([]string, 0)
 	for _, menu := range paramObj0.AppFunIds {
 		roleAppFun := &sysmodel.SysRoleAppFun{}
 		roleAppFun.Id = sysutils.NewUUID()
@@ -198,6 +200,7 @@ func SysApp_AddRoleAppFun(c *entitys.CtrlContext) {
 		roleAppFun.CreateTime = sysmodel.NowLocal()
 
 		roleAppFuns = append(roleAppFuns, roleAppFun)
+		ids = append(ids, roleAppFun.Id)
 	}
 
 	_, err = session.InsertMulti(&roleAppFuns)
@@ -208,12 +211,7 @@ func SysApp_AddRoleAppFun(c *entitys.CtrlContext) {
 	}
 
 	session.Commit()
-	ret := __none_func_system__(paramObj0)
-	if ret {
-		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
-	} else {
-		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
-	}
+	c.Ctx.JSON(200, sysmodel.SysReturn{200, "", strings.Join(ids, ",")})
 }
 
 // _DelRoleAppFun
@@ -435,12 +433,7 @@ func SysApp_AddDomainAppFuns(c *entitys.CtrlContext) {
 
 	session.Commit()
 
-	ret := __none_func_system__(paramObj0)
-	if ret {
-		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
-	} else {
-		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
-	}
+	c.Ctx.JSON(200, sysmodel.SysReturn{200, "", strings.Join(appFunIds, ",")})
 }
 
 func __none_func_sys_app__(params ...interface{}) bool {

+ 19 - 26
controllers/partial/SystemController.go

@@ -289,9 +289,8 @@ func System_AddUser(c *entitys.CtrlContext) {
 	}
 
 	_, err = c.Db.Insert(&user)
-	ret := __none_func_system__(user.LoginId, user.Password, user.OrgId, user.Email)
-	if ret && err == nil {
-		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
+	if err == nil {
+		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", user.Id})
 	} else {
 		c.Ctx.JSON(200, sysmodel.SysReturn{500, "域数据库插入用户错误:" + err.Error(), nil})
 	}
@@ -494,7 +493,7 @@ func System_AddRole(c *entitys.CtrlContext) {
 	_, err = c.Db.SqlMapClient("insert_sys_role", paramMap).Execute()
 
 	if err == nil {
-		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
+		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", paramObj0.Id})
 	} else {
 		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
 	}
@@ -751,7 +750,7 @@ func System_AddMenu(c *entitys.CtrlContext) {
 	_, err = c.Db.SqlMapClient("insert_sys_menu", paramMap).Execute()
 
 	if err == nil {
-		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
+		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", paramObj0.Id})
 	} else {
 		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
 	}
@@ -898,7 +897,7 @@ func System_AddOrg(c *entitys.CtrlContext) {
 	_, err = c.Db.SqlMapClient("insert_sys_org", paramMap).Execute()
 
 	if err == nil {
-		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
+		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", paramObj0.Id})
 	} else {
 		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
 	}
@@ -1218,13 +1217,7 @@ func System_AddDomainMenu(c *entitys.CtrlContext) {
 	}
 
 	session.Commit()
-
-	ret := __none_func_system__(paramObj0)
-	if ret {
-		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
-	} else {
-		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
-	}
+	c.Ctx.JSON(200, sysmodel.SysReturn{200, "", strings.Join(menuIds, ",")})
 }
 
 // _GetDomainMenuTree
@@ -1359,6 +1352,7 @@ func System_AddRoleMenu(c *entitys.CtrlContext) {
 		return
 	}
 
+	menuIds := make([]string, 0)
 	var roleMenus []*sysmodel.SysRoleMenu
 	for _, menu := range paramObj0.MenuIds {
 		roleMenu := &sysmodel.SysRoleMenu{}
@@ -1369,6 +1363,7 @@ func System_AddRoleMenu(c *entitys.CtrlContext) {
 		roleMenu.CreateTime = sysmodel.NowLocal()
 
 		roleMenus = append(roleMenus, roleMenu)
+		menuIds = append(menuIds, roleMenu.MenuId)
 	}
 
 	_, err = session.InsertMulti(&roleMenus)
@@ -1379,12 +1374,8 @@ func System_AddRoleMenu(c *entitys.CtrlContext) {
 	}
 
 	session.Commit()
-	ret := __none_func_system__(paramObj0)
-	if ret {
-		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
-	} else {
-		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
-	}
+
+	c.Ctx.JSON(200, sysmodel.SysReturn{200, "", strings.Join(menuIds, ",")})
 }
 
 // _FindAreaPage
@@ -2358,7 +2349,7 @@ func System_AddOptionset(c *entitys.CtrlContext) {
 	_, err := c.Db.SqlMapClient("insert_sys_optionset", paramMap).Execute()
 
 	if err == nil {
-		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
+		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", paramObj0.Id})
 	} else {
 		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
 	}
@@ -2495,9 +2486,8 @@ func System_AddTableColUser(c *entitys.CtrlContext) {
 	paramObj0.LastUpdateBy = user_id
 
 	_, err = c.Db.Insert(&paramObj0)
-
 	if err == nil {
-		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
+		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", paramObj0.Id})
 	} else {
 		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
 	}
@@ -2730,9 +2720,12 @@ func System_AddTagGroup(c *entitys.CtrlContext) {
 	}
 
 	_, err = session.Insert(&tags)
-
 	if err == nil {
-		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
+		ids := make([]string, 0)
+		for _, v := range tags {
+			ids = append(ids, v.Id)
+		}
+		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", strings.Join(ids, ",")})
 		session.Commit()
 	} else {
 		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
@@ -2824,7 +2817,7 @@ func System_UpdateTagGroup(c *entitys.CtrlContext) {
 
 	session.Commit()
 
-	c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
+	c.Ctx.JSON(200, sysmodel.SysReturn{200, "", obj.Id})
 }
 
 // _GetTagGroup
@@ -3029,7 +3022,7 @@ func System_AddUserTag(c *entitys.CtrlContext) {
 	userTag.DelFlag = 0
 
 	if _, err := c.Db.Insert(&userTag); err != nil {
-		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
+		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", userTag.Id})
 	} else {
 		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
 	}