|
|
@@ -1,6 +1,8 @@
|
|
|
<?php
|
|
|
namespace app\admin\controller;
|
|
|
|
|
|
+use think\Db;
|
|
|
+
|
|
|
class NoticeCommon extends Auth
|
|
|
{
|
|
|
|
|
|
@@ -66,7 +68,15 @@ class NoticeCommon extends Auth
|
|
|
$this->assign('info',$info);
|
|
|
|
|
|
}
|
|
|
- $userAll = model('User')->gerUserAll(cur_org_id());
|
|
|
+ $userAll = Db::name('user')
|
|
|
+ ->alias('u')
|
|
|
+ ->field('u.id,u.real_name as title')
|
|
|
+ ->join('user_org uo','u.id=uo.user_id')
|
|
|
+ ->where('uo.org_id',$this->orgId)
|
|
|
+ ->where('enable',1)
|
|
|
+ ->where('type',0)
|
|
|
+ ->where('del',0)
|
|
|
+ ->select();
|
|
|
$cate = model('NoticeCate')->lists();
|
|
|
$rolesAll = model('Roles')->getRolesAll(cur_org_id());
|
|
|
$this->assign('userAll',$userAll);
|