|
@@ -315,6 +315,12 @@ class SurveyController extends Controller {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+ foreach($list as $k => $v){
|
|
|
+ $zclist = Policy::find()->where(['type' => Policy::TYPE_SURVEY])->andWhere(['like','cengci',"{$v['level']}"])->all();
|
|
|
+ $list[$k]['policy'] = $zclist;
|
|
|
+ }
|
|
|
+
|
|
|
//去重复
|
|
|
$cengci = [];
|
|
|
foreach ($list as $value) {
|
|
@@ -334,7 +340,7 @@ class SurveyController extends Controller {
|
|
|
if(!empty($cengci)){
|
|
|
foreach ($cengci as $value) {
|
|
|
|
|
|
- $query->andWhere(new \yii\db\Expression('FIND_IN_SET("'.$value['level'].'", cengci)'));
|
|
|
+ $query->orWhere(new \yii\db\Expression('FIND_IN_SET("'.$value['level'].'", cengci)'));
|
|
|
}
|
|
|
$list = $query->all();
|
|
|
}
|