Merge pull request 'Merge 'Merge184' branch into 'Master'.' (#88) from Merge184 into master

Reviewed-on: https://git.zcorp.cc/easycorp/zentaopms/pulls/88
2023-12-01 10:41:31 +08:00
parent 9b576777f6 132ea6a2bc
commit 2aebcabe27
319 changed files with 4999 additions and 2140 deletions
@@ -465,10 +465,10 @@ class apiModel extends model
     */
    public function getStructByQuery($libID, $pager = '', $orderBy = '')
    {
-        return $this->dao->select('s.*,user.realname as addedName')->from(TABLE_APISTRUCT)->alias('s')
-            ->leftJoin(TABLE_USER)->alias('user')->on('user.account = s.addedBy')
-            ->where('s.deleted')->eq(0)
-            ->andWhere('s.lib')->eq($libID)
+        return $this->dao->select('t1.*,t2.realname as addedName')->from(TABLE_APISTRUCT)->alias('t1')
+            ->leftJoin(TABLE_USER)->alias('t2')->on('t2.account = t1.addedBy')
+            ->where('t1.deleted')->eq(0)
+            ->andWhere('t1.lib')->eq($libID)
            ->orderBy($orderBy)
            ->page($pager)
            ->fetchAll();