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/SysUserController.java

@@ -1454,7 +1454,9 @@ public class SysUserController {
 
 		if (CollUtil.isNotEmpty(deptIds)) {
 			// 税源地
-			Map<Integer, Map<String, Integer>> coll = sysDeptSubService.list(Wrappers.<SysDeptSub>lambdaQuery().in(SysDeptSub::getDeptId, deptIds))
+			Map<Integer, Map<String, Integer>> coll = sysDeptSubService.list(Wrappers.<SysDeptSub>lambdaQuery()
+					.eq(SysDeptSub::getEnableFlag, SubjectTypeEnum.ENABLE_FLAG_TRUE.getCode())
+					.in(SysDeptSub::getDeptId, deptIds))
 					.stream()
 					.collect(Collectors.groupingBy(SysDeptSub::getDeptId,
 							Collectors.toMap(sysDeptSub -> sysDeptSub.getSubjectLocation().name(), SysDeptSub::getSubjectChannel)));

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

@@ -102,7 +102,7 @@ public class SysUserSignCertController {
 		if (userSignCertDTO.getSubjectLocation() == null) {
 			return R.failed("税源地不能为空");
 		}
-		if (StrUtil.isBlank(userSignCertDTO.getBankPhone()) || !Validator.isMobile(userSignCertDTO.getBankPhone())) {
+		if (StrUtil.isNotBlank(userSignCertDTO.getBankPhone()) && !Validator.isMobile(userSignCertDTO.getBankPhone())) {
 			return R.failed("银行预留手机号不正确");
 		}
 		if (StrUtil.length(userSignCertDTO.getBankCardNumber()) < 16 || StrUtil.length(userSignCertDTO.getBankCardNumber()) > 19) {
@@ -287,6 +287,12 @@ public class SysUserSignCertController {
 		if (userSignCertDTO.getUserId() == null) {
 			return R.failed("userId不能为空");
 		}
+		if (StrUtil.isBlank(userSignCertDTO.getBankPhone())) {
+			return R.failed("银行预留手机号不能为空");
+		}
+		if (StrUtil.isBlank(userSignCertDTO.getBankCardNumber())) {
+			return R.failed("银行卡号不能为空");
+		}
 		return sysUserSignCertService.bindCardConfirm(userSignCertDTO);
 	}
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/model/GigUserInfoModel.java

@@ -98,10 +98,19 @@ public class GigUserInfoModel implements Serializable {
 	 */
 	private String certVideo2;
 
+	/**
+	 * 身份证照片-正面base64
+	 */
 	private String idCardFrontBase64;
 
+	/**
+	 * 身份证照片-反面base64
+	 */
 	private String idCardBackBase64;
 
+	/**
+	 * 最佳帧照片url
+	 */
 	private String bestFrameBase64;
 
 	/**

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/mapper/SysUserExtRecordMapper.java

@@ -2,10 +2,12 @@ package com.qunzhixinxi.hnqz.admin.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.qunzhixinxi.hnqz.admin.entity.SysUserExtRecord;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
 * 用户认证相关的扩展信息Mapper
 */
+@Mapper
 public interface SysUserExtRecordMapper extends BaseMapper<SysUserExtRecord> {
 
 

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

@@ -394,7 +394,7 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
 		updateWrapper.eq(SysUserSub::getUserId, userSignCertDTO.getUserId());
 		updateWrapper.eq(SysUserSub::getDeptId, sysUser.getDeptId());
 		if (userSignCertDTO.getSubjectLocation() != null) {
-			updateWrapper.in(SysUserSub::getSubjectLocation, userSignCertDTO.getSubjectLocation());
+			updateWrapper.eq(SysUserSub::getSubjectLocation, userSignCertDTO.getSubjectLocation());
 		}
 		updateWrapper.set(SysUserSub::getAgreementUrl, userSignCertDTO.getAgreementUrl());
 		updateWrapper.set(SysUserSub::getUpdateUser, SecurityUtils.getUser().getId());
@@ -415,7 +415,7 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
 		LambdaUpdateWrapper<SysUserSub> updateWrapper = Wrappers.lambdaUpdate();
 		updateWrapper.eq(SysUserSub::getUserId, userSignCertDTO.getUserId());
 		if (userSignCertDTO.getSubjectLocation() != null) {
-			updateWrapper.in(SysUserSub::getSubjectLocation, userSignCertDTO.getSubjectLocation());
+			updateWrapper.eq(SysUserSub::getSubjectLocation, userSignCertDTO.getSubjectLocation());
 		}
 		if (StrUtil.isNotBlank(userSignCertDTO.getAgreementUrl())) {
 			updateWrapper.set(SysUserSub::getAgreementUrl, userSignCertDTO.getAgreementUrl());
@@ -457,7 +457,7 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
 		// 查询当前用户关联的userSub
 		LambdaQueryWrapper<SysUserSub> userSubWrapper = Wrappers.lambdaQuery();
 		userSubWrapper.eq(SysUserSub::getUserId, userId);
-		userSubWrapper.eq(SysUserSub::getDeptId, dept.getDeptId());
+		userSubWrapper.eq(SysUserSub::getDeptId, sysUser.getDeptId());
 		userSubWrapper.eq(SysUserSub::getSubjectLocation, userSignCertDTO.getSubjectLocation());
 		List<SysUserSub> userSubList = sysUserSubService.list(userSubWrapper);
 

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

@@ -250,7 +250,9 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
 
 		 wmDaAgentIPage.getRecords().forEach(agent ->{
 
-		 	Map<String, Integer> collect = sysDeptSubMapper.selectList(Wrappers.<SysDeptSub>lambdaQuery().eq(SysDeptSub::getDeptId, agent.getDeptId()))
+		 	Map<String, Integer> collect = sysDeptSubMapper.selectList(Wrappers.<SysDeptSub>lambdaQuery()
+					.eq(SysDeptSub::getEnableFlag, SubjectTypeEnum.ENABLE_FLAG_TRUE.getCode())
+					.eq(SysDeptSub::getDeptId, agent.getDeptId()))
 		 			.stream().collect(Collectors.toMap(sysDeptSub -> sysDeptSub.getSubjectLocation().name(), SysDeptSub::getSubjectChannel));
 			agent.setSubjectType(collect.keySet().toArray(collect.keySet().toArray(new String[0])));
 		 	agent.setSubjectTypeAndChannel(collect);