修改bug

internal/pcmserver/bus/service/staff.go

@@ -141,11 +141,6 @@ func (ss *StaffService) updateStaffLeaveStatus(staffId int, leaveStatus uint8) (
 			return
 		}
 	} else {
-		// 销假 不允许开格子。张总说不用管柜子的状态，直接下发销假
-		err = cabinet_pkg.DisableGrid(staff.CabinetID, uint16(staff.GridDeviceID))
-		if err != nil {
-			return err
-		}
 		// 更新格子状态
 		gird := model.Grid{
 			CabinetID:    staff.CabinetID,
@@ -158,6 +153,11 @@ func (ss *StaffService) updateStaffLeaveStatus(staffId int, leaveStatus uint8) (
 		if err != nil {
 			return
 		}
+		// 销假 不允许开格子。张总说不用管柜子的状态，直接下发销假
+		err = cabinet_pkg.DisableGrid(staff.CabinetID, uint16(staff.GridDeviceID))
+		if err != nil {
+			return err
+		}
 	}
 
 	err = global.DB.Model(&model.Staff{}).Where("id = ?", staffId).Update("vacation_state", leaveStatus).Error

internal/pcmserver/resource/sys/menu.go

@@ -10,7 +10,7 @@ import (
 
 var MenuInitEntities = []model.Menu{
 	// 系统管理
-	1: {MenuID: 1, MenuName: "Admin", Path: "/admin", Component: "RouteView", Title: "系统管理", Paths: "/0/1", MenuType: "M", ParentId: 0, NoCache: true, Sort: 1, Visible: "1", SysApi: []model.Api{}, ControlBy: common.ControlBy{CreateBy: 1, UpdateBy: 1}, ModelTime: common.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}},
+	1: {MenuID: 1, Icon: "setting", MenuName: "Admin", Path: "/admin", Component: "RouteView", Title: "系统管理", Paths: "/0/1", MenuType: "M", ParentId: 0, NoCache: true, Sort: 1, Visible: "1", SysApi: []model.Api{}, ControlBy: common.ControlBy{CreateBy: 1, UpdateBy: 1}, ModelTime: common.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}},
 	// 系统管理-接口管理
 	10: {MenuID: 10, MenuName: "AdminSysApi", Path: "/admin/sys-api", Title: "接口管理", Paths: "/0/1/10", MenuType: "C", ParentId: 1, NoCache: true, Sort: 10, Visible: "1", SysApi: []model.Api{}, ControlBy: common.ControlBy{CreateBy: 1, UpdateBy: 1}, ModelTime: common.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}},
 	// 系统管理-接口管理-接口按钮
@@ -129,7 +129,7 @@ var MenuInitEntities = []model.Menu{
 
 var BusMenuEntities = []model.Menu{
 	// 平台管理
-	1000: {MenuID: 1000, MenuName: "Business", Path: "/business", Component: "RouteView", Title: "平台管理", Paths: "/0/1000", MenuType: "M", ParentId: 0, NoCache: true, Sort: 1000, Visible: "1", SysApi: []model.Api{}, ControlBy: common.ControlBy{CreateBy: 1, UpdateBy: 1}, ModelTime: common.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}},
+	1000: {MenuID: 1000, Icon: "setting", MenuName: "Business", Path: "/business", Component: "RouteView", Title: "平台管理", Paths: "/0/1000", MenuType: "M", ParentId: 0, NoCache: true, Sort: 1000, Visible: "1", SysApi: []model.Api{}, ControlBy: common.ControlBy{CreateBy: 1, UpdateBy: 1}, ModelTime: common.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}},
 	// 平台管理-柜子管理
 	1100: {MenuID: 1100, MenuName: "BusCabinet", Path: "/business/bus-cabinet", Title: "手机柜管理", Paths: "/0/1000/1100", MenuType: "C", ParentId: 1000, NoCache: true, Sort: 1100, Visible: "1", SysApi: []model.Api{}, ControlBy: common.ControlBy{CreateBy: 1, UpdateBy: 1}, ModelTime: common.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}},
 	// 平台管理-柜子管理-接口按钮