Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* fix bug #11115.

Browse Source
This commit is contained in:
wangyidong
2021-03-31 16:49:34 +08:00
parent 27317517dc
commit 5dd5f12b1f
4 changed files with 62 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/custom/model.php
+24 -4
View File
@@ -484,7 +484,7 @@ class customModel extends model
* Get UR and SR pairs.
*
* @access public
* @return void
* @return array
*/
public function getURSRPairs()
{
@@ -494,6 +494,11 @@ class customModel extends model
->andWhere('module')->eq('custom')
->andWhere('section')->eq('URSRList')
->fetchAll();
if(empty($langData))
{
$URSR = $this->loadModel('setting')->getURSR();
$langData = $this->dao->select('`key`, `value`, `system`')->from(TABLE_LANG)->where('`key`')->eq($URSR)->andWhere('module')->eq('custom')->andWhere('section')->eq('URSRList')->fetchAll();
}
$URSRPairs = array();
foreach($langData as $id => $content)
@@ -509,11 +514,16 @@ class customModel extends model
* Get UR pairs.
*
* @access public
* @return void
* @return array
*/
public function getURPairs()
{
$URSRList = $this->dao->select('`key`,`value`')->from(TABLE_LANG)->where('module')->eq('custom')->andWhere('section')->eq('URSRList')->andWhere('lang')->eq($this->app->clientLang)->fetchPairs();
if(empty($URSRList))
{
$URSR = $this->loadModel('setting')->getURSR();
$URSRList = $this->dao->select('`key`,`value`')->from(TABLE_LANG)->where('module')->eq('custom')->andWhere('section')->eq('URSRList')->andWhere('`key`')->eq($URSR)->fetchPairs();
}
$URPairs = array();
foreach($URSRList as $key => $value)
@@ -529,11 +539,16 @@ class customModel extends model
* Get SR pairs.
*
* @access public
* @return void
* @return array
*/
public function getSRPairs()
{
$URSRList = $this->dao->select('`key`,`value`')->from(TABLE_LANG)->where('module')->eq('custom')->andWhere('section')->eq('URSRList')->andWhere('lang')->eq($this->app->clientLang)->fetchPairs();
if(empty($URSRList))
{
$URSR = $this->loadModel('setting')->getURSR();
$URSRList = $this->dao->select('`key`,`value`')->from(TABLE_LANG)->where('module')->eq('custom')->andWhere('section')->eq('URSRList')->andWhere('`key`')->eq($URSR)->fetchPairs();
}
$SRPairs = array();
foreach($URSRList as $key => $value)
@@ -549,7 +564,7 @@ class customModel extends model
* Get UR and SR list.
*
* @access public
* @return void
* @return array
*/
public function getURSRList()
{
@@ -561,6 +576,11 @@ class customModel extends model
->andWhere('module')->eq('custom')
->andWhere('section')->eq('URSRList')
->fetchAll();
if(empty($langData))
{
$URSR = $this->loadModel('setting')->getURSR();
$langData = $this->dao->select('`key`, `value`, `system`')->from(TABLE_LANG)->where('`key`')->eq($URSR)->andWhere('module')->eq('custom')->andWhere('section')->eq('URSRList')->fetchAll();
}
$URSRList = array();
foreach($langData as $id => $content)