Merge branch 'dev' of ssh://git.bgbg.live:18150/root/SEONexus into dev
This commit is contained in:
@@ -127,7 +127,6 @@ class ConfigSubjectFomartModel extends MongoModel
|
|||||||
|
|
||||||
$arrNovel = $this->getOne($arrFilter, $arrOptions);
|
$arrNovel = $this->getOne($arrFilter, $arrOptions);
|
||||||
|
|
||||||
|
|
||||||
return $arrNovel;
|
return $arrNovel;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -137,9 +136,9 @@ class ConfigSubjectFomartModel extends MongoModel
|
|||||||
* @param integer $intNId
|
* @param integer $intNId
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
public function getConfigSubjectFomartByCfsKey(string $intNId): null|array
|
public function getConfigSubjectFomartByCsfKey(string $intNId): null|array
|
||||||
{
|
{
|
||||||
$arrFilter = ['cfs_key' => $intNId];
|
$arrFilter = ['csf_key' => $intNId];
|
||||||
return $this->findOne($arrFilter);
|
return $this->findOne($arrFilter);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -111,7 +111,8 @@ class DomainModel extends BaseModel
|
|||||||
|
|
||||||
$strUUId = sprintf('%s-%s-%s-%s-%s', $strDomain, $strController, $strAction, $strKey, $strDiff);
|
$strUUId = sprintf('%s-%s-%s-%s-%s', $strDomain, $strController, $strAction, $strKey, $strDiff);
|
||||||
|
|
||||||
$arrConfigSubjectFomart = ConfigSubjectFomartModel::getInstance()->getConfigSubjectFomartByCfsKey($strUUId);
|
$arrConfigSubjectFomart = ConfigSubjectFomartModel::getInstance()->getConfigSubjectFomartByCsfKey($strUUId);
|
||||||
|
|
||||||
|
|
||||||
if (empty($arrConfigSubjectFomart)) {
|
if (empty($arrConfigSubjectFomart)) {
|
||||||
|
|
||||||
@@ -120,7 +121,7 @@ class DomainModel extends BaseModel
|
|||||||
$SubjectFomartModel = $arrAllSubjectFomartModel[$intKey];
|
$SubjectFomartModel = $arrAllSubjectFomartModel[$intKey];
|
||||||
|
|
||||||
ConfigSubjectFomartModel::getInstance()->insert([
|
ConfigSubjectFomartModel::getInstance()->insert([
|
||||||
'cfs_key' => $strUUId,
|
'csf_key' => $strUUId,
|
||||||
'sf_id' => $SubjectFomartModel->sf_id,
|
'sf_id' => $SubjectFomartModel->sf_id,
|
||||||
]);
|
]);
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
Reference in New Issue
Block a user