|
@@ -251,7 +251,7 @@ class TalentAllowance extends EnterpriseController {
|
|
|
}
|
|
|
if (!$param["id"]) {
|
|
|
$where = [];
|
|
|
- $where[] = ["year", "=", $param["year"]];
|
|
|
+ $where[] = ["year", "like", substr($param["year"], 0, 4) . "%"];
|
|
|
$where[] = ["idCard", "=", $param["idCard"]];
|
|
|
$where[] = ["delete", "=", 0];
|
|
|
$where[] = ["checkState", "not in", [MainState::NOTPASS, MainState::PASS]];
|
|
@@ -1139,10 +1139,11 @@ class TalentAllowance extends EnterpriseController {
|
|
|
$batch = BatchApi::getValidBatch(ProjectState::JBT, $this->user["type"]);
|
|
|
$year = $batch["batch"];
|
|
|
if ($year) {
|
|
|
+ $year = substr($year, 0, 4);
|
|
|
$ids = null;
|
|
|
//根据申报年度查询当前企业已申报的人才
|
|
|
$where = [];
|
|
|
- $where[] = ["year", "=", $year];
|
|
|
+ $where[] = ["year", "like", $year . "%"];
|
|
|
$where[] = ["enterpriseId", "=", $this->user["uid"]];
|
|
|
$talentAllowances = TaModel::where($where)->select()->toArray();
|
|
|
$ids = array_unique(array_column($talentAllowances, "talentId"));
|