|
@@ -296,12 +296,13 @@ func System_AddUser(c *SystemController) {
|
|
|
count, _ := c.Db.SQL("select * from sys_user").Where("login_id = ?", user.LoginId).Count(&oldUser)
|
|
count, _ := c.Db.SQL("select * from sys_user").Where("login_id = ?", user.LoginId).Count(&oldUser)
|
|
|
|
|
|
|
|
if count > 1 {
|
|
if count > 1 {
|
|
|
- if oldUser.DelFlag == 0 {
|
|
|
|
|
- oldUser.DelFlag = 1
|
|
|
|
|
|
|
+ if oldUser.DelFlag == 1 {
|
|
|
|
|
+ oldUser.DelFlag = 0
|
|
|
_, err := c.Db.Id("id").Cols("del_flag").Update(&oldUser)
|
|
_, err := c.Db.Id("id").Cols("del_flag").Update(&oldUser)
|
|
|
if err != nil {
|
|
if err != nil {
|
|
|
c.Ctx.JSON(200, sysmodel.SysReturn{500, "login_id exit, update err: " + err.Error(), nil})
|
|
c.Ctx.JSON(200, sysmodel.SysReturn{500, "login_id exit, update err: " + err.Error(), nil})
|
|
|
}
|
|
}
|
|
|
|
|
+ return
|
|
|
} else {
|
|
} else {
|
|
|
c.Ctx.JSON(200, sysmodel.SysReturn{500, "login_id exit", nil})
|
|
c.Ctx.JSON(200, sysmodel.SysReturn{500, "login_id exit", nil})
|
|
|
return
|
|
return
|
|
@@ -316,7 +317,7 @@ func System_AddUser(c *SystemController) {
|
|
|
user.LastUpdateDate = time.Now()
|
|
user.LastUpdateDate = time.Now()
|
|
|
user.CreateBy = user_id
|
|
user.CreateBy = user_id
|
|
|
user.LastUpdateBy = user_id
|
|
user.LastUpdateBy = user_id
|
|
|
- user.DelFlag = 1
|
|
|
|
|
|
|
+ user.DelFlag = 0
|
|
|
user.Password = utils.HashPassword(user.Password, "")
|
|
user.Password = utils.HashPassword(user.Password, "")
|
|
|
|
|
|
|
|
_, err := c.Db.Insert(&user)
|
|
_, err := c.Db.Insert(&user)
|
|
@@ -352,14 +353,14 @@ func System_DelUser(c *SystemController) {
|
|
|
defer session.Close()
|
|
defer session.Close()
|
|
|
|
|
|
|
|
//_, err := c.Db.Table(new(models.SysUser)).ID(param.Id).Update(map[string]interface{}{"del_flag": 0})
|
|
//_, err := c.Db.Table(new(models.SysUser)).ID(param.Id).Update(map[string]interface{}{"del_flag": 0})
|
|
|
- _, err := c.Db.Table(new(models.SysUser)).In("id", ids).Update(map[string]interface{}{"del_flag": 0})
|
|
|
|
|
|
|
+ _, err := c.Db.Table(new(models.SysUser)).In("id", ids).Update(map[string]interface{}{"del_flag": 1})
|
|
|
if err != nil {
|
|
if err != nil {
|
|
|
session.Rollback()
|
|
session.Rollback()
|
|
|
c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
|
|
c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
|
|
|
return
|
|
return
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- _, err = c.Db.Table(new(models.SysUserRole)).In("user_id", ids).Update(map[string]interface{}{"del_flag": 0})
|
|
|
|
|
|
|
+ _, err = c.Db.Table(new(models.SysUserRole)).In("user_id", ids).Update(map[string]interface{}{"del_flag": 1})
|
|
|
if err != nil {
|
|
if err != nil {
|
|
|
session.Rollback()
|
|
session.Rollback()
|
|
|
c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
|
|
c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
|
|
@@ -416,7 +417,7 @@ func System_UpdateUser(c *SystemController) {
|
|
|
userRoles[i].LastUpdateBy = user_id
|
|
userRoles[i].LastUpdateBy = user_id
|
|
|
userRoles[i].CreateTime = time.Now()
|
|
userRoles[i].CreateTime = time.Now()
|
|
|
userRoles[i].LastUpdateDate = time.Now()
|
|
userRoles[i].LastUpdateDate = time.Now()
|
|
|
- userRoles[i].DelFlag = 1
|
|
|
|
|
|
|
+ userRoles[i].DelFlag = 0
|
|
|
}
|
|
}
|
|
|
_, err = c.Db.Insert(userRoles)
|
|
_, err = c.Db.Insert(userRoles)
|
|
|
if err != nil {
|
|
if err != nil {
|
|
@@ -457,7 +458,7 @@ func System_AddRole(c *SystemController) {
|
|
|
user_id := c.Ctx.GetString("user_id")
|
|
user_id := c.Ctx.GetString("user_id")
|
|
|
|
|
|
|
|
role.Id = utils.NewUUID()
|
|
role.Id = utils.NewUUID()
|
|
|
- role.DelFlag = 1
|
|
|
|
|
|
|
+ role.DelFlag = 0
|
|
|
role.CreateBy = user_id
|
|
role.CreateBy = user_id
|
|
|
role.LastUpdateBy = user_id
|
|
role.LastUpdateBy = user_id
|
|
|
role.CreateTime = time.Now()
|
|
role.CreateTime = time.Now()
|
|
@@ -492,7 +493,7 @@ func System_DelRole(c *SystemController) {
|
|
|
ids = append(ids, param.Id)
|
|
ids = append(ids, param.Id)
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- _, err := c.Db.Table(new(models.SysRole)).In("id", ids).Update(map[string]interface{}{"del_flag": 0})
|
|
|
|
|
|
|
+ _, err := c.Db.Table(new(models.SysRole)).In("id", ids).Update(map[string]interface{}{"del_flag": 1})
|
|
|
if err != nil {
|
|
if err != nil {
|
|
|
c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
|
|
c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
|
|
|
return
|
|
return
|
|
@@ -709,7 +710,7 @@ func System_AddMenu(c *SystemController) {
|
|
|
sysmenu.LastUpdateBy = user_id
|
|
sysmenu.LastUpdateBy = user_id
|
|
|
sysmenu.LastUpdateDate = time.Now()
|
|
sysmenu.LastUpdateDate = time.Now()
|
|
|
sysmenu.CreateTime = time.Now()
|
|
sysmenu.CreateTime = time.Now()
|
|
|
- sysmenu.DelFlag = 1
|
|
|
|
|
|
|
+ sysmenu.DelFlag = 0
|
|
|
|
|
|
|
|
_, err := c.Db.Insert(&sysmenu)
|
|
_, err := c.Db.Insert(&sysmenu)
|
|
|
if err != nil {
|
|
if err != nil {
|