|
@@ -1,10 +1,10 @@
|
|
|
package controllers
|
|
|
|
|
|
import (
|
|
|
- "bzd_server/Nats/NatsServer"
|
|
|
- "bzd_server/conf"
|
|
|
- "bzd_server/models/Account"
|
|
|
- "bzd_server/models/System"
|
|
|
+ "ERP_user/Nats/NatsServer"
|
|
|
+ "ERP_user/conf"
|
|
|
+ "ERP_user/models/Account"
|
|
|
+ "ERP_user/models/System"
|
|
|
"fmt"
|
|
|
menulibs "git.baozhida.cn/ERP_libs/Menu"
|
|
|
powerlibs "git.baozhida.cn/ERP_libs/Power"
|
|
@@ -80,14 +80,16 @@ func (c *PowerController) Get() {
|
|
|
var menu []menulibs.Menu
|
|
|
var power powerlibs.Power
|
|
|
var err error
|
|
|
+
|
|
|
+ power, err = Account.Read_Power_ByT_id(T_id)
|
|
|
+ if err != nil {
|
|
|
+ c.Data["json"] = lib.JSONS{Code: 202, Msg: "查询失败!"}
|
|
|
+ c.ServeJSON()
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
switch T_code {
|
|
|
case conf.ERP_Account_Sys:
|
|
|
- power, err = Account.Read_Power_ByT_id(T_id)
|
|
|
- if err != nil {
|
|
|
- c.Data["json"] = lib.JSONS{Code: 202, Msg: "查询失败!"}
|
|
|
- c.ServeJSON()
|
|
|
- return
|
|
|
- }
|
|
|
menu, err = Account.Read_Menu_List()
|
|
|
if err != nil {
|
|
|
c.Data["json"] = lib.JSONS{Code: 202, Msg: "获取用户系统菜单失败!"}
|
|
@@ -97,9 +99,20 @@ func (c *PowerController) Get() {
|
|
|
default:
|
|
|
power, err = NatsServer.ERP_Read_Power_ByT_id(T_code, T_id)
|
|
|
if err != nil {
|
|
|
- c.Data["json"] = lib.JSONS{Code: 202, Msg: fmt.Sprintf("获取%s权限失败!", sysName)}
|
|
|
- c.ServeJSON()
|
|
|
- return
|
|
|
+ if err.Error() == orm.ErrNoRows.Error() {
|
|
|
+ var_ := powerlibs.Power{
|
|
|
+ T_id: power.T_id,
|
|
|
+ T_name: power.T_name,
|
|
|
+ }
|
|
|
+ _, err = NatsServer.ERP_Add_Power(T_code, var_)
|
|
|
+ if err != nil {
|
|
|
+ logs.Error(lib.FuncName(), err)
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ c.Data["json"] = lib.JSONS{Code: 202, Msg: fmt.Sprintf("获取%s权限失败!", sysName)}
|
|
|
+ c.ServeJSON()
|
|
|
+ return
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
menu, err = NatsServer.ERP_Read_Menu_List(T_code)
|
|
@@ -187,16 +200,16 @@ func (c *PowerController) Edit() {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- var_, err := Account.Read_Power_ByT_id(T_id)
|
|
|
+ power, err := Account.Read_Power_ByT_id(T_id)
|
|
|
if err != nil {
|
|
|
c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_id Err!"}
|
|
|
c.ServeJSON()
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- var_.T_name = T_name
|
|
|
+ power.T_name = T_name
|
|
|
|
|
|
- id, err := Account.Update_Power(var_)
|
|
|
+ id, err := Account.Update_Power(power)
|
|
|
if err != nil {
|
|
|
c.Data["json"] = lib.JSONS{Code: 202, Msg: "修改失败!"}
|
|
|
c.ServeJSON()
|
|
@@ -209,9 +222,13 @@ func (c *PowerController) Edit() {
|
|
|
// Nats 发送失败 重试3次
|
|
|
i := 3
|
|
|
for {
|
|
|
- _, err = NatsServer.ERP_Read_Power_ByT_id(prefix, T_id)
|
|
|
+ power, err = NatsServer.ERP_Read_Power_ByT_id(prefix, T_id)
|
|
|
if err != nil {
|
|
|
if err.Error() == orm.ErrNoRows.Error() {
|
|
|
+ var_ := powerlibs.Power{
|
|
|
+ T_id: power.T_id,
|
|
|
+ T_name: T_name,
|
|
|
+ }
|
|
|
_, err = NatsServer.ERP_Add_Power(prefix, var_)
|
|
|
if err == nil || i == 0 {
|
|
|
break
|
|
@@ -222,24 +239,25 @@ func (c *PowerController) Edit() {
|
|
|
return
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
- _, err = NatsServer.ERP_Update_Power(prefix, var_)
|
|
|
- if err == nil || i == 0 {
|
|
|
- break
|
|
|
+ if power.Id > 0 {
|
|
|
+ power.T_name = T_name
|
|
|
+ _, err = NatsServer.ERP_Update_Power(prefix, power)
|
|
|
+ if err == nil || i == 0 {
|
|
|
+ break
|
|
|
+ }
|
|
|
}
|
|
|
i--
|
|
|
}
|
|
|
|
|
|
if err != nil {
|
|
|
sysName := Account.Get_Sys_Name(prefix)
|
|
|
-
|
|
|
c.Data["json"] = lib.JSONS{Code: 202, Msg: sysName + "修改失败!"}
|
|
|
c.ServeJSON()
|
|
|
return
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- System.Add_UserLogs_T(c.User.T_uuid, "权限", "修改", var_)
|
|
|
+ System.Add_UserLogs_T(c.User.T_uuid, "权限", "修改", power)
|
|
|
|
|
|
c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: id}
|
|
|
c.ServeJSON()
|
|
@@ -287,8 +305,7 @@ func (c *PowerController) Edit_Menu() {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- var_, err := Account.Read_Power_ByT_id(T_id)
|
|
|
- var_.T_menu = T_menu
|
|
|
+ power, err := Account.Read_Power_ByT_id(T_id)
|
|
|
if err != nil {
|
|
|
c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_id Err!"}
|
|
|
c.ServeJSON()
|
|
@@ -297,33 +314,46 @@ func (c *PowerController) Edit_Menu() {
|
|
|
var id int64
|
|
|
switch T_code {
|
|
|
case conf.ERP_Account_Sys:
|
|
|
- id, err = Account.Update_Power(var_)
|
|
|
+ power.T_menu = T_menu
|
|
|
+ id, err = Account.Update_Power(power)
|
|
|
if err != nil {
|
|
|
c.Data["json"] = lib.JSONS{Code: 202, Msg: "修改失败!"}
|
|
|
c.ServeJSON()
|
|
|
return
|
|
|
}
|
|
|
default:
|
|
|
- _, err = NatsServer.ERP_Read_Power_ByT_id(T_code, T_id)
|
|
|
+ power, err = NatsServer.ERP_Read_Power_ByT_id(T_code, T_id)
|
|
|
if err != nil {
|
|
|
if err.Error() == orm.ErrNoRows.Error() {
|
|
|
+ var_ := powerlibs.Power{
|
|
|
+ T_id: power.T_id,
|
|
|
+ T_name: power.T_name,
|
|
|
+ T_menu: T_menu,
|
|
|
+ }
|
|
|
_, err = NatsServer.ERP_Add_Power(T_code, var_)
|
|
|
+ if err != nil {
|
|
|
+ c.Data["json"] = lib.JSONS{Code: 202, Msg: fmt.Sprintf("%s 修改失败!", sysName)}
|
|
|
+ c.ServeJSON()
|
|
|
+ return
|
|
|
+ }
|
|
|
} else {
|
|
|
c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_id Err!"}
|
|
|
c.ServeJSON()
|
|
|
return
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
- id, err = NatsServer.ERP_Update_Power(T_code, var_)
|
|
|
- if err != nil {
|
|
|
- c.Data["json"] = lib.JSONS{Code: 202, Msg: fmt.Sprintf("%s 修改失败!", sysName)}
|
|
|
- c.ServeJSON()
|
|
|
- return
|
|
|
+ if power.Id > 0 {
|
|
|
+ power.T_menu = T_menu
|
|
|
+ id, err = NatsServer.ERP_Update_Power(T_code, power)
|
|
|
+ if err != nil {
|
|
|
+ c.Data["json"] = lib.JSONS{Code: 202, Msg: fmt.Sprintf("%s 修改失败!", sysName)}
|
|
|
+ c.ServeJSON()
|
|
|
+ return
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
Account.Redis_Menu_DelK(T_id)
|
|
|
- System.Add_UserLogs_T(c.User.T_uuid, "权限", sysName+" 修改菜单", var_)
|
|
|
+ System.Add_UserLogs_T(c.User.T_uuid, "权限", sysName+" 修改菜单", power)
|
|
|
|
|
|
c.Data["json"] = lib.JSONS{Code: 200, Msg: sysName + " ok!", Data: id}
|
|
|
c.ServeJSON()
|