diff --git a/api/internal/logic/apps/deleteappbyappnamelogic.go b/api/internal/logic/apps/deleteappbyappnamelogic.go index 4fba20f2..8898ec09 100644 --- a/api/internal/logic/apps/deleteappbyappnamelogic.go +++ b/api/internal/logic/apps/deleteappbyappnamelogic.go @@ -27,7 +27,7 @@ func (l *DeleteAppByAppNameLogic) DeleteAppByAppName(req *types.DeleteAppReq) (r resp = &types.DeleteAppResp{} var task = &Task{} //查询应用的yamlString - l.svcCtx.DbEngin.Raw(`select * from task where ns_id= ? and name= ? `, req.NsID, req.Name).Scan(&task) + l.svcCtx.DbEngin.Raw(`select * from task where ns_id= ? and name= ? AND deleted_at IS NULL`, req.NsID, req.Name).Scan(&task) if task.Id == 0 { resp.Code = 500 resp.Msg = "App not fount" diff --git a/api/internal/logic/apps/getappbyappnamelogic.go b/api/internal/logic/apps/getappbyappnamelogic.go index 3d03f698..cdd57fc3 100644 --- a/api/internal/logic/apps/getappbyappnamelogic.go +++ b/api/internal/logic/apps/getappbyappnamelogic.go @@ -23,7 +23,7 @@ func NewGetAppByAppNameLogic(ctx context.Context, svcCtx *svc.ServiceContext) *G func (l *GetAppByAppNameLogic) GetAppByAppName(req *types.AppDetailReq) (resp interface{}, err error) { var task Task - db := l.svcCtx.DbEngin.Raw("select * from task where ns_id = ? and name = ?", req.NsID, req.Name).Scan(&task) + db := l.svcCtx.DbEngin.Raw("select * from task where ns_id = ? and name = ? AND deleted_at IS NULL", req.NsID, req.Name).Scan(&task) if db.Error != nil { logx.Errorf("db error: %v", db.Error) return diff --git a/api/internal/logic/apps/restartappbyappnamelogic.go b/api/internal/logic/apps/restartappbyappnamelogic.go index 1703a2d9..aa618b68 100644 --- a/api/internal/logic/apps/restartappbyappnamelogic.go +++ b/api/internal/logic/apps/restartappbyappnamelogic.go @@ -29,7 +29,7 @@ func (l *RestartAppByAppNameLogic) RestartAppByAppName(req *types.DeleteAppReq) resp = &types.AppResp{} var task = &Task{} //查询应用的yamlString - l.svcCtx.DbEngin.Raw(`select * from task where ns_id= ? and name= ? `, req.NsID, req.Name).Scan(&task) + l.svcCtx.DbEngin.Raw(`select * from task where ns_id= ? and name= ? AND deleted_at IS NULL`, req.NsID, req.Name).Scan(&task) if task.Id == 0 { resp.Code = 500 resp.Msg = "App not fount"