|
|
@@ -8,6 +8,7 @@ import cn.hutool.json.JSONUtil;
|
|
|
import com.qunzhixinxi.hnqz.admin.api.constant.CacheConstants;
|
|
|
import com.qunzhixinxi.hnqz.admin.entity.SysUserSub;
|
|
|
import com.qunzhixinxi.hnqz.admin.entity.dto.UserSignCertDTO;
|
|
|
+import com.qunzhixinxi.hnqz.admin.enums.GigTypeEnum;
|
|
|
import com.qunzhixinxi.hnqz.admin.service.gig.SysUserSignCertService;
|
|
|
import com.qunzhixinxi.hnqz.common.core.util.R;
|
|
|
import com.qunzhixinxi.hnqz.common.log.annotation.SysLog;
|
|
|
@@ -79,12 +80,13 @@ public class SysUserSignCertController {
|
|
|
if (userSignCertDTO.getUserId() == null) {
|
|
|
return R.failed("userId不能为空");
|
|
|
}
|
|
|
- if (StrUtil.isBlank(userSignCertDTO.getAgreementUrl())) {
|
|
|
- return R.failed("协议不能为空");
|
|
|
- }
|
|
|
if (CollUtil.isEmpty(userSignCertDTO.getGigTypeList())) {
|
|
|
return R.failed("认证渠道不能为空");
|
|
|
}
|
|
|
+ if (!userSignCertDTO.getGigTypeList().contains(GigTypeEnum.REN_LI_JIA) && StrUtil.isBlank(userSignCertDTO.getAgreementUrl())) {
|
|
|
+ // 除人力家外，其他都做校验
|
|
|
+ return R.failed("协议不能为空");
|
|
|
+ }
|
|
|
List<SysUserSub> userSubList = sysUserSignCertService.listUserSignCert(userSignCertDTO.getUserId(), userSignCertDTO.getGigTypeList());
|
|
|
if (CollUtil.isEmpty(userSubList)) {
|
|
|
return R.failed("数据异常");
|
|
|
@@ -142,7 +144,7 @@ public class SysUserSignCertController {
|
|
|
return R.failed("数据异常");
|
|
|
}
|
|
|
for (SysUserSub userSub : userSubList) {
|
|
|
- if (StrUtil.isBlank(userSub.getAgreementUrl())) {
|
|
|
+ if (!userSignCertDTO.getGigTypeList().contains(GigTypeEnum.REN_LI_JIA) && StrUtil.isBlank(userSub.getAgreementUrl())) {
|
|
|
return R.failed("协议不能为空");
|
|
|
}
|
|
|
if (!StrUtil.isAllNotBlank(userSub.getIdCardBackUrl(), userSub.getIdCardFrontUrl(),
|
