修改bug

internal/pcmserver/bus/service/grid.go

@@ -71,6 +71,11 @@ func (gs *GridService) UpdateByCabinetIDAndGridID(grid model.Grid) (err error) {
 		if err != nil {
 			log.Error("sendUpdateCabinetOpenStatus", zap.Error(err))
 		}
+
+		err = sendDeptStoneInfo(memInfo.DeptID, true, nil)
+		if err != nil {
+			log.Error("sendDeptStoneInfo", zap.Error(err))
+		}
 	}()
 	return
 }
@@ -153,14 +158,15 @@ func (gs *GridService) OpenGrid(gridId int) (err error) {
 
 func (gs *GridService) GetGridUseInfo(cabinetIds []int) (use int64, noUse int64, err error) {
 
-	err = global.DB.Model(&model.Grid{}).Where("cabinet_id in (?)", cabinetIds).Where("stone_state = ?", "未存物").Count(&noUse).Error
+	err = global.DB.Model(&model.Grid{}).Where("cabinet_id in (?)", cabinetIds).Where("grid_info != ?", "请假中").Where("stone_state = ?", "未存物").Count(&noUse).Error
 	if err != nil {
 		return use, noUse, rescode.RegisterErrorWithCause(err, code.ErrCodeMap[code.ErrDatabaseCode])
 	}
-	err = global.DB.Model(&model.Grid{}).Where("cabinet_id in (?)", cabinetIds).Where("stone_state = ?", "存物").Count(&use).Error
+	err = global.DB.Model(&model.Grid{}).Where("cabinet_id in (?)", cabinetIds).Where("grid_info != ?", "请假中").Where("stone_state = ?", "存物").Count(&use).Error
 	if err != nil {
 		return use, noUse, rescode.RegisterErrorWithCause(err, code.ErrCodeMap[code.ErrDatabaseCode])
 	}
+
 	return use, noUse, nil
 }
 

internal/pcmserver/bus/service/home_client_proto.go

@@ -279,7 +279,7 @@ func sendLeaveInfo(staffId int) error {
 	if err != nil {
 		return err
 	}
-	return pushWsClients(&HomeMsg{DeptID: 0, Update: false, MsgType: wstLeaveRes, Data: string(dataMsg)})
+	return pushWsClients(&HomeMsg{DeptID: leaveLog.DepartmentID, Update: false, MsgType: wstLeaveRes, Data: string(dataMsg)})
 }
 
 func pushWsClients(homeMessages ...*HomeMsg) error {