|
@@ -1541,6 +1541,7 @@ class TalentAllowance extends AdminController {
|
|
|
$where[] = ["type", "=", $info["type"]];
|
|
|
$where[] = ["project", "=", \app\common\state\ProjectState::JBT];
|
|
|
$where[] = ["active", "=", 1];
|
|
|
+ $where[] = ["isConditionFile", "=", $info["allowanceType"]];
|
|
|
$where[] = ["delete", "=", 0];
|
|
|
$filetypes = Db::table("new_common_filetype")->where($where)->order("sn asc")->select()->toArray();
|
|
|
$res["files"] = $filetypes;
|
|
@@ -1585,6 +1586,7 @@ class TalentAllowance extends AdminController {
|
|
|
$where[] = ["type", "=", $info["type"]];
|
|
|
$where[] = ["project", "=", \app\common\state\ProjectState::JBT];
|
|
|
$where[] = ["active", "=", 1];
|
|
|
+ $where[] = ["isConditionFile", "=", $info["allowanceType"]];
|
|
|
$where[] = ["delete", "=", 0];
|
|
|
$filetypes = Db::table("new_common_filetype")->where($where)->order("sn asc")->select()->toArray();
|
|
|
$res["files"] = $filetypes;
|