|
@@ -236,7 +236,7 @@ class TalentTypeChange extends EnterpriseController {
|
|
if (\StrUtil::isEmpOrNull($data->param('newIdentifyGetTime'))) {
|
|
if (\StrUtil::isEmpOrNull($data->param('newIdentifyGetTime'))) {
|
|
return json(["msg" => "新认定条件证书取得时间不能为空", "code" => 500]);
|
|
return json(["msg" => "新认定条件证书取得时间不能为空", "code" => 500]);
|
|
}
|
|
}
|
|
- $res = TalentTypeChangeModel::where('idCard', $data->param('idCard'))->where('id', '<>', $data->param('id'))->whereRaw('isPublic <> 6 and (isPublic <> 5 or checkState <> -1)')->find();
|
|
|
|
|
|
+ $res = TalentTypeChangeModel::where('idCard', $data->param('idCard'))->where('id', '<>', $data->param('id'))->whereRaw('isPublic <> 6 and (isPublic <> 5 or checkState <> -1) and `delete`<>1')->find();
|
|
|
|
|
|
if ($res) {
|
|
if ($res) {
|
|
return json(["msg" => "添加失败,该证件号码已申报", "code" => 500]);
|
|
return json(["msg" => "添加失败,该证件号码已申报", "code" => 500]);
|