cuimengchao 3 years ago
parent
commit
88e6110728

+ 5 - 5
src/main/java/com/yx/face/model/vo/AdminVO.java

@@ -101,10 +101,10 @@ public class AdminVO {
     private Integer isHideImportant;
 
 
-    @ApiModelProperty("脱敏数据查询是否配置 0-未配置 1 -配置")
-    private Integer sysQueryConfiguration;
-
-    @ApiModelProperty("脱敏数据查询配置是否开启 0-未开启 1 -开启")
-    private Integer sysQueryConfigurationStatus;
+//    @ApiModelProperty("脱敏数据查询是否配置 0-未配置 1 -配置")
+//    private Integer sysQueryConfiguration;
+//
+//    @ApiModelProperty("脱敏数据查询配置是否开启 0-未开启 1 -开启")
+//    private Integer sysQueryConfigurationStatus;
 }
 

+ 14 - 14
src/main/java/com/yx/face/service/impl/AdminServiceImpl.java

@@ -121,13 +121,13 @@ public class AdminServiceImpl implements AdminService {
         if (adminInfo.getTagId() != null) {
             adminLoginVO.setTagName(adminTagDao.selectByPrimaryKey(adminInfo.getTagId()).getName());
         }
-        SystemConfigVO vo = systemConfigDao.sysConfiguration(adminLoginVO.getAdminId());
-        if (vo != null) {
-            adminLoginVO.setSysQueryConfiguration(1);
-            adminLoginVO.setSysQueryConfiguration(vo.getStatus());
-        } else {
-            adminLoginVO.setSysQueryConfiguration(0);
-        }
+//        SystemConfigVO vo = systemConfigDao.sysConfiguration(adminLoginVO.getAdminId());
+//        if (vo != null) {
+//            adminLoginVO.setSysQueryConfiguration(1);
+//            adminLoginVO.setSysQueryConfiguration(vo.getStatus());
+//        } else {
+//            adminLoginVO.setSysQueryConfiguration(0);
+//        }
         /*wxg 2021-11-4 增加省市区详细地址 结束*/
         return adminLoginVO;
     }
@@ -172,13 +172,13 @@ public class AdminServiceImpl implements AdminService {
         adminLoginVO.setPoliceStationCode(adminInfo.getPoliceStationCode());
         adminLoginVO.setPoliceStationName(adminInfo.getPoliceStationName());
         /*wxg 2021-11-4 增加省市区详细地址 结束*/
-        SystemConfigVO vo = systemConfigDao.sysConfiguration(adminLoginVO.getAdminId());
-        if (vo != null) {
-            adminLoginVO.setSysQueryConfiguration(1);
-            adminLoginVO.setSysQueryConfiguration(vo.getStatus());
-        } else {
-            adminLoginVO.setSysQueryConfiguration(0);
-        }
+//        SystemConfigVO vo = systemConfigDao.sysConfiguration(adminLoginVO.getAdminId());
+//        if (vo != null) {
+//            adminLoginVO.setSysQueryConfiguration(1);
+//            adminLoginVO.setSysQueryConfiguration(vo.getStatus());
+//        } else {
+//            adminLoginVO.setSysQueryConfiguration(0);
+//        }
         return adminLoginVO;
     }
 

+ 4 - 3
src/main/java/com/yx/face/service/impl/FaceTBServiceImpl.java

@@ -547,11 +547,12 @@ public class FaceTBServiceImpl implements FaceTBService {
             if (data.get("xcInfo") != null) {
                 xcInfo = data.get("xcInfo").toString();
             }
-
-            if (verifytype == 2) {
+//            if (verifytype == 2) {
+            Map<String, Object> map = (Map<String, Object>) data.get("idCard");
+            if (!map.isEmpty()) {
                 log.info("verifytype==2 代表刷身份证解析身份证 ;{}", data.get("idCard"));
                 //身份证信息
-                Map<String, Object> map = (Map<String, Object>) data.get("idCard");
+//                Map<String, Object> map = (Map<String, Object>) data.get("idCard");
                 if (map.get("address") != null) {
                     sfzAddress = map.get("address").toString();
                 }