From 8237f91297c4327520a547420f6d005039c634f9 Mon Sep 17 00:00:00 2001 From: caoming <604844710@qq.com> Date: Wed, 30 Oct 2019 16:15:11 +0800 Subject: [PATCH] app-ht(v1.8.6 build 14) 1.所有物理删除改为逻辑删除 2.版本管理添加厂商过滤 --- app-ht/config/params.php | 2 +- app-ht/modules/upgrade/controllers/UpgradeController.php | 40 ++++++++++++++++++++++++++++++++++++++++ app-ht/modules/upgrade/views/upgrade/create.php | 10 +++++++--- domain/manufacturer/Manufacturer.php | 6 +++--- domain/manufacturer/ManufacturerRepository.php | 3 ++- domain/model/Model.php | 2 +- domain/model/ModelRepository.php | 3 ++- domain/production/Production.php | 2 +- domain/production/ProductionRepository.php | 3 ++- domain/project/Project.php | 2 +- domain/project/ProjectRepository.php | 3 ++- 11 files changed, 62 insertions(+), 14 deletions(-) diff --git a/app-ht/config/params.php b/app-ht/config/params.php index dd36d7a..c42feaf 100644 --- a/app-ht/config/params.php +++ b/app-ht/config/params.php @@ -1,5 +1,5 @@ 'v1.8.6 build 13', + 'VERSION' => 'v1.8.6 build 14', 'MANUFACTURE_ROLE_ID' => 1 ]; \ No newline at end of file diff --git a/app-ht/modules/upgrade/controllers/UpgradeController.php b/app-ht/modules/upgrade/controllers/UpgradeController.php index b834fbd..94e9ef0 100644 --- a/app-ht/modules/upgrade/controllers/UpgradeController.php +++ b/app-ht/modules/upgrade/controllers/UpgradeController.php @@ -69,6 +69,10 @@ class UpgradeController extends BaseController if ($dataType) { $where[] = ['=', 'u.type', $dataType]; } + $user = Yii::$app->user->identity; + if (isset($user->is_manufacture) && $user->is_manufacture == 1) { + $where[] = ['like', 'mf.sys_user_id', $user->id]; + } if ($type == 0) { $pageList = UpgradeRepository::getPageList($where, 0 , 0); $pages = null; @@ -95,6 +99,15 @@ class UpgradeController extends BaseController public function actionCreate() { $gets = $this->request->get(); + $user = Yii::$app->user->identity; + if (isset($user->is_manufacture) && $user->is_manufacture == 1) { + $gets["is_manufacture"] = 1; + $manufacturer = ManufacturerRepository::findOne(["sys_user_id" => $user->id]); + if ($manufacturer) { + $gets["manufacture_name"] = $manufacturer->name; + $gets["manufacture_id"] = $manufacturer->id; + } + } return $this->render('create', ['gets' => $gets]); } @@ -110,6 +123,14 @@ class UpgradeController extends BaseController Yii::$app->session->setFlash('error', '版本不能为空'); return $this->render('create'); } + $user = Yii::$app->user->identity; + if (isset($user->is_manufacture) && $user->is_manufacture == 1) { + $manufacturer = ManufacturerRepository::findOne(["sys_user_id" => $user->id]); + if (empty($manufacturer) || $manufacturer->id != $request->post("manufacturer_id")) { + Yii::$app->session->setFlash('error', '添加失败'); + return $this->render('create'); + } + } $result = Upgrade::create($request->post()); if ($result === -1) { Yii::$app->session->setFlash('error', '添加失败，版本' . $version . '已存在'); @@ -157,6 +178,15 @@ class UpgradeController extends BaseController $params = $this->dataList(1); return $this->render('index', $params); } + $user = Yii::$app->user->identity; + if (isset($user->is_manufacture) && $user->is_manufacture == 1) { + $manufacturer = ManufacturerRepository::findOne(["sys_user_id" => $user->id]); + if (empty($manufacturer) || $manufacturer->id != $request->post("manufacturer_id")) { + Yii::$app->session->setFlash('error', '编辑失败'); + $params = $this->dataList(1); + return $this->render('index', $params); + } + } $upgrade = UpgradeRepository::selectOne($uid,true); if (isset($upgrade["path"])) { $upgrade["oldName"] = $upgrade["path"]; @@ -207,6 +237,16 @@ class UpgradeController extends BaseController $request = Yii::$app->request; $itemId = $request->post("data_id"); $msg = array(); + $user = Yii::$app->user->identity; + if (isset($user->is_manufacture) && $user->is_manufacture == 1) { + $manufacturer = ManufacturerRepository::findOne(["sys_user_id" => $user->id]); + $upgrade = UpgradeRepository::selectOne($itemId,true); + if (empty($upgrade) || empty($manufacturer) || $manufacturer->id != $request->post("manufacturer_id")) { + $msg['status'] = 0; + $msg['msg'] = "删除"; + return $this->renderJson($msg); + } + } // 删除对应的版本 if (Upgrade::delete($itemId)) { diff --git a/app-ht/modules/upgrade/views/upgrade/create.php b/app-ht/modules/upgrade/views/upgrade/create.php index 1ed82d8..dd7513e 100644 --- a/app-ht/modules/upgrade/views/upgrade/create.php +++ b/app-ht/modules/upgrade/views/upgrade/create.php @@ -50,7 +50,11 @@ $this->params['breadcrumbs'][] = $this->title;
"/> -
>
+ +
>
+ +
>
+
@@ -122,7 +126,7 @@ $this->params['breadcrumbs'][] = $this->title; l.start(); return false; }); - + $("#select_manufacture").bind("click", function () { var getUrl = ''; var version = $("input[name='version']").val(); @@ -142,7 +146,7 @@ $this->params['breadcrumbs'][] = $this->title; getUrl = getUrl + "&isCreate=" + 1; window.location.href = getUrl; }); - + //上传文件函数 //ids唯一ID //folder文件保存目录 diff --git a/domain/manufacturer/Manufacturer.php b/domain/manufacturer/Manufacturer.php index f2b708e..c082738 100644 --- a/domain/manufacturer/Manufacturer.php +++ b/domain/manufacturer/Manufacturer.php @@ -124,11 +124,11 @@ class Manufacturer return false; } if (isset($manufacturerModel->sys_user_id)) { - SysUserModel::deleteAll(["id" => $manufacturerModel->sys_user_id]); // 删除登录用户 - SysUserProfileModel::deleteAll(["sys_user_id" => $manufacturerModel->sys_user_id]); // 删除登录用户 + SysUserModel::updateAll(["is_enable" => 0], ["id" => $manufacturerModel->sys_user_id]); // 删除登录用户 + //SysUserProfileModel::deleteAll(["sys_user_id" => $manufacturerModel->sys_user_id]); // 删除登录用户 } - return ManufacturerModel::deleteAll(["id" => $id]); + return ManufacturerModel::updateAll(["is_delete" => 1], ["id" => $id]); } /** diff --git a/domain/manufacturer/ManufacturerRepository.php b/domain/manufacturer/ManufacturerRepository.php index d9532f0..92788b4 100644 --- a/domain/manufacturer/ManufacturerRepository.php +++ b/domain/manufacturer/ManufacturerRepository.php @@ -39,7 +39,7 @@ class ManufacturerRepository if ($limit) { $manufacturerFind->limit($limit); } - + $manufacturerFind->andWhere(["is_delete" => 0]); $manufacturerFind->orderBy("m.id desc"); $manufacturerFind->asArray(); $dataList = $manufacturerFind->all(); @@ -61,6 +61,7 @@ class ManufacturerRepository if (!empty($map)) { $manufacturerFind->where($map); } + $manufacturerFind->andWhere(["is_delete" => 0]); $pageCount = $manufacturerFind->count(); return $pageCount; diff --git a/domain/model/Model.php b/domain/model/Model.php index 323f76a..92c0c09 100644 --- a/domain/model/Model.php +++ b/domain/model/Model.php @@ -73,7 +73,7 @@ class Model return false; } - return ModelModel::deleteAll(["id" => $id]); + return ModelModel::updateAll(["is_delete" => 1], ["id" => $id]); } /** diff --git a/domain/model/ModelRepository.php b/domain/model/ModelRepository.php index 19f6f7c..ffeb2b7 100644 --- a/domain/model/ModelRepository.php +++ b/domain/model/ModelRepository.php @@ -35,7 +35,7 @@ class ModelRepository if ($limit) { $modelFind->limit($limit); } - + $modelFind->andWhere(["is_delete" => 0]); $modelFind->orderBy("m.id desc"); $modelFind->asArray(); $dataList = $modelFind->all(); @@ -53,6 +53,7 @@ class ModelRepository if (!empty($map)) { $modelFind->where($map); } + $modelFind->andWhere(["is_delete" => 0]); $pageCount = $modelFind->count(); return $pageCount; diff --git a/domain/production/Production.php b/domain/production/Production.php index a2fdf79..a944afd 100644 --- a/domain/production/Production.php +++ b/domain/production/Production.php @@ -73,7 +73,7 @@ class Production return false; } - return ProductionModel::deleteAll(["id" => $id]); + return ProductionModel::updateAll(["is_delete" => 1], ["id" => $id]); } /** diff --git a/domain/production/ProductionRepository.php b/domain/production/ProductionRepository.php index e570bef..c36e7ec 100644 --- a/domain/production/ProductionRepository.php +++ b/domain/production/ProductionRepository.php @@ -35,7 +35,7 @@ class ProductionRepository if ($limit) { $productionFind->limit($limit); } - + $productionFind->andWhere(["is_delete" => 0]); $productionFind->orderBy("p.id desc"); $productionFind->asArray(); $dataList = $productionFind->all(); @@ -53,6 +53,7 @@ class ProductionRepository if (!empty($map)) { $productionFind->where($map); } + $productionFind->andWhere(["is_delete" => 0]); $pageCount = $productionFind->count(); return $pageCount; diff --git a/domain/project/Project.php b/domain/project/Project.php index d2d303c..7c98d7e 100644 --- a/domain/project/Project.php +++ b/domain/project/Project.php @@ -73,7 +73,7 @@ class Project return false; } - return ProjectModel::deleteAll(["id" => $id]); + return ProjectModel::updateAll(["is_delete" => 1], ["id" => $id]); } /** diff --git a/domain/project/ProjectRepository.php b/domain/project/ProjectRepository.php index d2993fb..32e998c 100644 --- a/domain/project/ProjectRepository.php +++ b/domain/project/ProjectRepository.php @@ -35,7 +35,7 @@ class ProjectRepository if ($limit) { $modelFind->limit($limit); } - + $modelFind->andWhere(["is_delete" => 0]); $modelFind->orderBy("p.id desc"); $modelFind->asArray(); $dataList = $modelFind->all(); @@ -53,6 +53,7 @@ class ProjectRepository if (!empty($map)) { $modelFind->where($map); } + $modelFind->andWhere(["is_delete" => 0]); $pageCount = $modelFind->count(); return $pageCount; -- libgit2 0.21.0