1.进出记录 增加身份证查询

2.进出记录红码信息不脱敏

src/main/java/com/yx/face/service/impl/FaceServiceImpl.java

@@ -260,22 +260,23 @@ public class FaceServiceImpl implements FaceService {
         PageHelper.startPage(dto.getPageNum(), dto.getPageSize());
         List<FaceLogVO> list = faceLogDao.getFaceLogs(map);
         for (FaceLogVO faceLog : list) {
-            if (faceLog.getPhone() != null)
-                faceLog.setPhone(SMSOrIdCardUtils.hidePhone(faceLog.getPhone()));
-            if (faceLog.getCardid() != null)
-                faceLog.setCardid(SMSOrIdCardUtils.hideIdNumber(faceLog.getCardid()));
+            if(!faceLog.getJkmStatus().equals("01") && !faceLog.getJkmStatus().equals("10")){
+                if (faceLog.getPhone() != null)
+                    faceLog.setPhone(SMSOrIdCardUtils.hidePhone(faceLog.getPhone()));
+                if (faceLog.getCardid() != null)
+                    faceLog.setCardid(SMSOrIdCardUtils.hideIdNumber(faceLog.getCardid()));
+            }
+
             if (faceLog.getName() != null)
                 faceLog.setName(faceLog.getName().trim());
-            faceLog.setCardid(IDCardEncryptionUtil.idEncrypt(faceLog.getCardid()));
+
             if (StringUtils.isNotBlank(faceLog.getYmStatus())) {
                 String[] split = faceLog.getYmStatus().split(",");
                 faceLog.setYmStatus(split[1]);
-//                faceLog.setYmTime(split[0]);
             }
             if (StringUtils.isNotBlank(faceLog.getHsStatus())) {
                 String[] split = faceLog.getHsStatus().split(";");
                 faceLog.setHsStatus(split[0]);
-//                faceLog.setHsTime(split[1]);
             }
         }
         return new PageInfo<>(list);

src/main/resources/mapper/FaceLogDao.xml

@@ -117,6 +117,9 @@
             <if test="query.phone != null and query.phone != ''">
                 AND ui.phone = #{query.phone}
             </if>
+            <if test="query.idNumber != null and query.idNumber != ''">
+                AND log.cardid = #{query.idNumber}
+            </if>
             <if test="query.deviceSn != null and query.deviceSn != ''">
                 AND log.device_sn = #{query.deviceSn}
             </if>