From b7bbb9cb164fff045a08b95c35ad6092c9f20332 Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Thu, 20 Apr 2023 17:12:19 +0800
Subject: [PATCH] * Adjst the code.

---
 config/zentaopms.php         | 3 +--
 module/action/config.php     | 1 -
 module/action/lang/de.php    | 1 -
 module/action/lang/en.php    | 1 -
 module/action/lang/fr.php    | 1 -
 module/action/lang/zh-cn.php | 1 -
 module/action/model.php      | 2 +-
 7 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/config/zentaopms.php b/config/zentaopms.php
index c092d3ad3a..0c6ca4595c 100644
--- a/config/zentaopms.php
+++ b/config/zentaopms.php
@@ -374,7 +374,6 @@ define('CHANGEVALUE', 100000000);
 
 define('TABLE_PRIV',         '`' . $config->db->prefix . 'priv`');
 define('TABLE_PRIVLANG',     '`' . $config->db->prefix . 'privlang`');
-define('TABLE_PRIVPACKAGE',  '`' . $config->db->prefix . 'privpackage`');
 define('TABLE_PRIVMANAGER',  '`' . $config->db->prefix . 'privmanager`');
 define('TABLE_PRIVRELATION', '`' . $config->db->prefix . 'privrelation`');
 
@@ -433,7 +432,7 @@ $config->objectTables['automation']   = TABLE_AUTOMATION;
 $config->objectTables['stepResult']   = TABLE_TESTRUN;
 $config->objectTables['priv']         = TABLE_PRIV;
 $config->objectTables['privlang']     = TABLE_PRIVLANG;
-$config->objectTables['privpackage']  = TABLE_PRIVPACKAGE;
+$config->objectTables['privmanager']  = TABLE_PRIVMANAGER;
 $config->objectTables['privrelation'] = TABLE_PRIVRELATION;
 $config->objectTables['scene']        = TABLE_SCENE;
 
diff --git a/module/action/config.php b/module/action/config.php
index a5c9ba79bd..cb66e5d9eb 100755
--- a/module/action/config.php
+++ b/module/action/config.php
@@ -51,7 +51,6 @@ $config->action->objectNameFields['repo']         = 'name';
 $config->action->objectNameFields['dataview']     = 'name';
 $config->action->objectNameFields['zahost']       = 'name';
 $config->action->objectNameFields['zanode']       = 'name';
-$config->action->objectNameFields['privpackage']  = 'name';
 $config->action->objectNameFields['privlang']     = 'name';
 $config->action->objectNameFields['scene']        = 'title';
 
diff --git a/module/action/lang/de.php b/module/action/lang/de.php
index 692c91e01f..f4a7199288 100644
--- a/module/action/lang/de.php
+++ b/module/action/lang/de.php
@@ -160,7 +160,6 @@ $lang->action->objectTypes['stage']            = 'Stage';
 $lang->action->objectTypes['patch']            = 'Patch';
 $lang->action->objectTypes['repo']             = 'Repo';
 $lang->action->objectTypes['dataview']         = 'Data View';
-$lang->action->objectTypes['privpackage']      = 'Priv Package';
 $lang->action->objectTypes['privlang']         = 'Priv';
 $lang->action->objectTypes['scene']            = 'Scene';
 
diff --git a/module/action/lang/en.php b/module/action/lang/en.php
index 72122896de..573afc3ba2 100755
--- a/module/action/lang/en.php
+++ b/module/action/lang/en.php
@@ -160,7 +160,6 @@ $lang->action->objectTypes['stage']            = 'Stage';
 $lang->action->objectTypes['patch']            = 'Patch';
 $lang->action->objectTypes['repo']             = 'Repo';
 $lang->action->objectTypes['dataview']         = 'Data View';
-$lang->action->objectTypes['privpackage']      = 'Priv Package';
 $lang->action->objectTypes['privlang']         = 'Priv';
 $lang->action->objectTypes['scene']            = 'Scene';
 
diff --git a/module/action/lang/fr.php b/module/action/lang/fr.php
index 64b48612f8..fcec4f79be 100644
--- a/module/action/lang/fr.php
+++ b/module/action/lang/fr.php
@@ -160,7 +160,6 @@ $lang->action->objectTypes['stage']            = 'Stage';
 $lang->action->objectTypes['patch']            = 'Patch';
 $lang->action->objectTypes['repo']             = 'Repo';
 $lang->action->objectTypes['dataview']         = 'Data View';
-$lang->action->objectTypes['privpackage']      = 'Priv Package';
 $lang->action->objectTypes['privlang']         = 'Priv';
 $lang->action->objectTypes['scene']            = 'Scene';
 
diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php
index 2ef53d3698..6996d80c6d 100755
--- a/module/action/lang/zh-cn.php
+++ b/module/action/lang/zh-cn.php
@@ -160,7 +160,6 @@ $lang->action->objectTypes['stage']            = '阶段';
 $lang->action->objectTypes['patch']            = '补丁';
 $lang->action->objectTypes['repo']             = '代码库';
 $lang->action->objectTypes['dataview']         = '中间表';
-$lang->action->objectTypes['privpackage']      = '权限包';
 $lang->action->objectTypes['privlang']         = '权限';
 $lang->action->objectTypes['scene']            = '场景';
 
diff --git a/module/action/model.php b/module/action/model.php
index d082501cc8..38ad677f37 100755
--- a/module/action/model.php
+++ b/module/action/model.php
@@ -1480,7 +1480,7 @@ class actionModel extends model
                 }
                 elseif($objectType == 'privlang')
                 {
-                    $objectName = $this->dao->select("priv AS id, $field AS name")->from($table)->where('priv')->in($objectIdList)->fetchPairs();
+                    $objectName = $this->dao->select("objectID AS id, $field AS name")->from($table)->where('objectID')->in($objectIdList)->andWhere('objectType')->eq('priv')->fetchPairs();
                 }
                 else
                 {