src/main/java/org/springblade/modules/system/mapper/UserMapper.java
@@ -321,4 +321,12 @@ UserInfoDetail getUserInfoDetail(@Param("id") String id); boolean batchAudit(@Param("ids") String ids, @Param("auditStatus") String auditStatus); /** * 根据身份证号和保安证编号确定用户 * @param cardid 身份证号 * @param securitynumber 保安证编号 * @return */ User getUserInfoByIdCardNoAndSecurityNumber(@Param("cardid") String cardid,@Param("securityNumber") String securitynumber); } src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -1176,6 +1176,17 @@ WHERE bu.is_deleted = 0 and bu.id = #{id} </select> <select id="getUserInfoByIdCardNoAndSecurityNumber" resultType="org.springblade.modules.system.entity.User"> SELECT id, name, real_name RealName,securitynumber,dept_id FROM blade_user where 1=1 and is_deleted = 0 and status = 1 and cardid = #{cardid} and securitynumber = #{securityNumber} </select> </mapper> src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -1900,11 +1900,11 @@ @Override public Boolean wxRegister(User user) { User params = new User(); params.setPhone(user.getPhone()); //查看数据库是否有相同手机号 params.setCardid(user.getCardid()); //查看数据库是否有相同身份证号 List<User> list = list(Condition.getQueryWrapper(params)); if (list.size()>0){ throw new ServiceException("该用户已注册"); throw new ServiceException("该身份证号已注册"); } //注册新用户 @@ -1966,13 +1966,12 @@ } } //根据身份证获取用户 User userInfoByIdCardNo = baseMapper.getUserInfoByIdCardNo(userExcel.getCardid()); //根据身份证、保安证编号获取用户 User userInfoByIdCardNo = baseMapper.getUserInfoByIdCardNoAndSecurityNumber(userExcel.getCardid(),userExcel.getSecuritynumber()); if (!userInfoByIdCardNo.getSecuritynumber().equals( userExcel.getSecuritynumber())){ throw new ServiceException("导入失败!保安证编号与系统不匹配!"); if (userInfoByIdCardNo == null){ throw new ServiceException("导入失败!身份证号和保安证编号与系统不匹配!"); } User user = new User(); user.setId(userInfoByIdCardNo.getId());