浏览代码

fix:子系统权限id不存在菜单添加不上

zoie 1 天之前
父节点
当前提交
fa4272c7f8
共有 6 个文件被更改,包括 20 次插入7 次删除
  1. 1 1
      conf/app.conf
  2. 5 4
      controllers/Power.go
  3. 7 0
      controllers/User.go
  4. 1 1
      go.mod
  5. 2 0
      go.sum
  6. 4 1
      models/Account/User.go

+ 1 - 1
conf/app.conf

@@ -34,6 +34,6 @@ Sys = ERP_ACCOUNT|账号管理,ERP_AMS|考勤管理,ERP_SALARY|薪资管理,ERP_
 # Sys = ERP_ACCOUNT|账号管理,ERP_STORAGE|仓库管理
 
 # 冷链验证地址
-ColdVerify_OpenApi_Host = "http://coldverifytest.coldbaozhida.com:9999/apiserver"
+ColdVerify_OpenApi_Host = "http://8.148.211.203:91/apiserver"
 
 

+ 5 - 4
controllers/Power.go

@@ -317,7 +317,8 @@ func (c *PowerController) Edit_Menu() {
 			return
 		}
 	default:
-		power, err = NatsServer.ERP_Read_Power_ByT_id(T_code, T_id)
+		var power2 powerlibs.Power
+		power2, err = NatsServer.ERP_Read_Power_ByT_id(T_code, T_id)
 		if err != nil {
 			if err.Error() == orm.ErrNoRows.Error() {
 				var_ := powerlibs.Power{
@@ -337,9 +338,9 @@ func (c *PowerController) Edit_Menu() {
 				return
 			}
 		}
-		if power.Id > 0 {
-			power.T_menu = T_menu
-			id, err = NatsServer.ERP_Update_Power(T_code, power)
+		if power2.Id > 0 {
+			power2.T_menu = T_menu
+			id, err = NatsServer.ERP_Update_Power(T_code, power2)
 			if err != nil {
 				c.Data["json"] = lib.JSONS{Code: 202, Msg: fmt.Sprintf("%s 修改失败!", sysName)}
 				c.ServeJSON()

+ 7 - 0
controllers/User.go

@@ -135,6 +135,7 @@ func (c *UserController) Add() {
 	T_expire, _ := c.GetInt("T_expire")
 	T_remark := c.GetString("T_remark")
 	T_verify_cold_uuid := c.GetString("T_verify_cold_uuid")
+	T_verify_perf_target, _ := c.GetInt("T_verify_perf_target")
 
 	var_ := Account.User{
 		T_power:       T_power,
@@ -163,6 +164,7 @@ func (c *UserController) Add() {
 		T_expire:              T_expire,
 		T_remark:              T_remark,
 		T_verify_cold_uuid:    T_verify_cold_uuid,
+		T_verify_perf_target:  T_verify_perf_target,
 	}
 	if len(T_power) < 1 {
 		c.Data["json"] = lib.JSONS{Code: 204, Msg: "权限异常!"}
@@ -265,6 +267,7 @@ func (c *UserController) Edit() {
 	T_expire, T_expire_err := c.GetInt("T_expire")
 	T_remark := c.GetString("T_remark")
 	T_verify_cold_uuid := c.GetString("T_verify_cold_uuid")
+	T_verify_perf_target, _ := c.GetInt("T_verify_perf_target")
 
 	var err error
 	var user Account.User
@@ -397,6 +400,10 @@ func (c *UserController) Edit() {
 		user.T_verify_cold_uuid = T_verify_cold_uuid
 		cols = append(cols, "T_verify_cold_uuid")
 	}
+	if T_verify_perf_target > 0 {
+		user.T_verify_perf_target = T_verify_perf_target
+		cols = append(cols, "T_verify_perf_target")
+	}
 
 	if err = Account.Update_User(user, cols...); err != nil {
 		c.Data["json"] = lib.JSONS{Code: 208, Msg: "修改失败!"}

+ 1 - 1
go.mod

@@ -37,7 +37,7 @@ require (
 	github.com/shopspring/decimal v1.3.1 // indirect
 	github.com/signintech/gopdf v0.16.1 // indirect
 	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
-	gogs.baozhida.cn/zoie/ERP_libs v0.0.0-20250418032958-0b7532afe8a3 // indirect
+	gogs.baozhida.cn/zoie/ERP_libs v0.0.0-20250901061433-cb5c3676aa11 // indirect
 	golang.org/x/crypto v0.31.0 // indirect
 	golang.org/x/net v0.33.0 // indirect
 	golang.org/x/sync v0.10.0 // indirect

+ 2 - 0
go.sum

@@ -319,6 +319,8 @@ gogs.baozhida.cn/zoie/ERP_libs v0.0.0-20250418020524-a1f59fa88f45 h1:0z7tkgInCBS
 gogs.baozhida.cn/zoie/ERP_libs v0.0.0-20250418020524-a1f59fa88f45/go.mod h1:wS/rgL1FkdfMsCwKpwG04dZtG4SOFcBADi4lxHN7UeM=
 gogs.baozhida.cn/zoie/ERP_libs v0.0.0-20250418032958-0b7532afe8a3 h1:gaqybp5CMEZbZz82CfF7SJFX7oIRyKKNQNXKQYPW8pk=
 gogs.baozhida.cn/zoie/ERP_libs v0.0.0-20250418032958-0b7532afe8a3/go.mod h1:wS/rgL1FkdfMsCwKpwG04dZtG4SOFcBADi4lxHN7UeM=
+gogs.baozhida.cn/zoie/ERP_libs v0.0.0-20250901061433-cb5c3676aa11 h1:aMuM32qXdOojinJW9w9rm0tSopDvD5eecI14YXnwMdA=
+gogs.baozhida.cn/zoie/ERP_libs v0.0.0-20250901061433-cb5c3676aa11/go.mod h1:wS/rgL1FkdfMsCwKpwG04dZtG4SOFcBADi4lxHN7UeM=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=

+ 4 - 1
models/Account/User.go

@@ -41,7 +41,8 @@ type User struct {
 	T_expire              int    `orm:"size(8);default(0)"`  // 是否到期 0-否 1-是
 	T_remark              string `orm:"size(32);null"`       // 备注
 	T_cold_uuid           string `orm:"size(32);null"`       // 关联冷链uuid
-	T_verify_cold_uuid    string `orm:"size(200);null"`       // 关联冷链验证uuid
+	T_verify_cold_uuid    string `orm:"size(200);null"`      // 关联冷链验证uuid
+	T_verify_perf_target  int    `orm:"size(200);null"`      // 关联验证人员绩效考核指标
 
 	T_State    int       `orm:"size(200);default(1)"`                                  //  0删除  1 正常 2 离职
 	CreateTime time.Time `orm:"column(create_time);type(timestamp);null;auto_now_add"` //auto_now 每次 model 保存时都会对时间自动更新
@@ -77,6 +78,7 @@ type User_R struct {
 	T_remark              string
 	T_State               int
 	T_verify_cold_uuid    string
+	T_verify_perf_target  int
 }
 
 var User_r *User
@@ -120,6 +122,7 @@ func UserToUser_R(r User) (m User_R) {
 	m.T_remark = r.T_remark
 	m.T_State = r.T_State
 	m.T_verify_cold_uuid = r.T_verify_cold_uuid
+	m.T_verify_perf_target = r.T_verify_perf_target
 
 	return
 }