|
|
@@ -377,14 +377,14 @@ class Education extends PersonController {
|
|
|
$where[] = ["card_number", "=", $this->user["idCard"]];
|
|
|
$where[] = ["checkState", "=", \app\common\api\TalentState::CERTIFICATED];
|
|
|
$where[] = ["isEffect", "=", 1];
|
|
|
- $list = \app\enterprise\model\Talent::where($where)->select()->toArray();
|
|
|
+ $list = \app\enterprise\model\Talent::where($where)->order("talent_arrange asc")->select()->toArray();
|
|
|
|
|
|
$whereOld = [];
|
|
|
$whereOld[] = ["idCard", "=", $this->user["idCard"]];
|
|
|
$whereOld[] = ["isPublic", "=", 6];
|
|
|
$whereOld[] = ["checkState", "=", MainState::PASS];
|
|
|
$whereOld[] = ["isEffect", "=", 1];
|
|
|
- $oldList = Db::table("un_talent_info")->where($whereOld)->select()->toArray();
|
|
|
+ $oldList = Db::table("un_talent_info")->where($whereOld)->order("talentArrange asc")->select()->toArray();
|
|
|
if (!$list && !$oldList) {
|
|
|
$response->msg = "未查询到有效的人才数据（根据证件号码匹配），无法申报";
|
|
|
return json($response);
|
|
|
@@ -392,8 +392,8 @@ class Education extends PersonController {
|
|
|
$count = $list ? count($list) : count($oldList);
|
|
|
$expireTime = $list ? $list[0]["certificateExpireTime"] : $oldList[0]["qzgccrcActiveTime"];
|
|
|
if ($count > 1) {
|
|
|
- $response->msg = "根据证件号码查询到多条在库数据，无法申报，可联系相关单位取消重复人才资格";
|
|
|
- return json($response);
|
|
|
+ //$response->msg = "根据证件号码查询到多条在库数据，无法申报，可联系相关单位取消重复人才资格";
|
|
|
+ //return json($response);
|
|
|
}
|
|
|
if ($this->user["type"] == 1 && (!strtotime($expireTime) || strtotime($expireTime) < time())) {
|
|
|
$response->msg = "您的人才证书已过期，请进行人才层次变更后再申报";
|
sugangqiang