Merge remote-tracking branch 'origin/feat-20220721-eidcert' into feat-20220721-eidcert

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/ApiController.java

@@ -769,7 +769,7 @@ public class ApiController {
 
 
 				// 认证服务信息回显
-				List<SysUserSubVO> userSignCertList = sysUserSignCertService.listUserSignCertForApi(sysU.getUserId());
+				List<SysUserSubVO> userSignCertList = sysUserSignCertService.listUserSignCertForApi(sysU.getUserId(), sysU.getDeptId());
 				mapOne.put("certList", userSignCertList);
 
 				// 查询是否已认证过E证通

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysUserController.java

@@ -1481,6 +1481,7 @@ public class SysUserController {
 			if (CollUtil.isNotEmpty(subList)) {
 				// 查询当前用户认证渠道
 				List<SysUserSub> userSubList = sysUserSubService.list(Wrappers.<SysUserSub>lambdaQuery()
+						.eq(SysUserSub::getDeptId, userVO.getDeptId())
 						.eq(SysUserSub::getUserId, userVO.getUserId()));
 
 				if (CollUtil.isNotEmpty(userSubList)) {

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/gig/SysUserSignCertService.java

@@ -39,9 +39,10 @@ public interface SysUserSignCertService {
 	 * 查询用户签约认证信息
 	 *
 	 * @param userId
+	 * @param deptId
 	 * @return
 	 */
-	List<SysUserSubVO> listUserSignCertForApi(Integer userId);
+	List<SysUserSubVO> listUserSignCertForApi(Integer userId, Integer deptId);
 
 	/**
 	 * 查询用户认证状态

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/gig/impl/SysUserSignCertServiceImpl.java

@@ -145,12 +145,13 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
 	 * 查询用户签约认证信息
 	 *
 	 * @param userId
+	 * @param deptId
 	 * @return
 	 */
-	@Deprecated
 	@Override
-	public List<SysUserSubVO> listUserSignCertForApi(Integer userId) {
+	public List<SysUserSubVO> listUserSignCertForApi(Integer userId, Integer deptId) {
 		List<SysUserSub> userSubList = sysUserSubService.list(Wrappers.<SysUserSub>lambdaQuery()
+				.eq(SysUserSub::getDeptId, deptId)
 				.eq(SysUserSub::getUserId, userId));
 		if (CollUtil.isNotEmpty(userSubList)) {
 			List<SysUserSubVO> resultList = new ArrayList<>();
@@ -351,6 +352,9 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
 						successFlag = true;
 						certStatus = Integer.parseInt(OladingCertStatus.SIGNING.getCode());
 						requestId = data.getStr("requestId");
+					} else if ("1004".equals(data.getStr("code"))) {
+						successFlag = true;
+						certStatus = Integer.parseInt(OladingCertStatus.SIGNING.getCode());
 					}
 					message = data.getStr("message");
 				}