From ecfd5d254416983e057d0105d7596ef21792d42c Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.com>
Date: Thu, 23 Dec 2021 16:06:23 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E7=A7=81=E6=95=B0=E6=8D=AEend?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/dao/VerificationFreeUserDao.java   | 16 ++++++++--------
 .../impl/VerificationFreeUserServiceImpl.java    | 14 +++++++-------
 .../resources/mapper/VerificationFreeUserDao.xml | 12 ++++++------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/VerificationFreeUserDao.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/VerificationFreeUserDao.java
index 1ef61f8..e801390 100644
--- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/VerificationFreeUserDao.java
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/VerificationFreeUserDao.java
@@ -37,27 +37,27 @@ public interface VerificationFreeUserDao extends BaseDao<VerificationFreeUserEnt
 
     /**
      * 是否需要校验当前登录人的手机号
-     *  true  为不需要
-     *  false 为需要
+     *  >= 1   为不需要
+     *  = 0    为需要
      *
      * @param sysUserId
-     * @return java.lang.Boolean
+     * @return java.lang.Integer
      * @Author zhangyong
      * @Date 09:52 2021-12-23
      **/
-    Boolean isVerificationBySysUserId(@Param("sysUserId") Long sysUserId);
+    Integer isVerificationBySysUserId(@Param("sysUserId") Long sysUserId);
 
     /**
      * 指定系统用户，是否已设置过 隐私数据权限
-     *  true  设置过
-     *  false 未设置
+     *  >= 1  设置过
+     *  = 0   未设置
      *
      * @param sysUserId
-     * @return java.lang.Boolean
+     * @return java.lang.Integer
      * @Author zhangyong
      * @Date 09:52 2021-12-23
      **/
-    Boolean isExistBySysUserId(@Param("sysUserId") Long sysUserId);
+    Integer isExistBySysUserId(@Param("sysUserId") Long sysUserId);
 
     /**
      * 查询系统用户信息
diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/VerificationFreeUserServiceImpl.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/VerificationFreeUserServiceImpl.java
index b592668..1519761 100644
--- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/VerificationFreeUserServiceImpl.java
+++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/VerificationFreeUserServiceImpl.java
@@ -116,8 +116,8 @@ public class VerificationFreeUserServiceImpl extends BaseServiceImpl<Verificatio
             throw new RenException("用户未登录");
         }
         // 免校验么？
-        Boolean noVerification = baseDao.isVerificationBySysUserId(user.getId());
-        if (!noVerification) {
+        Integer noVerification = baseDao.isVerificationBySysUserId(user.getId());
+        if (NumConstant.ZERO == noVerification) {
             // 如果当前登录账号的手机号在 30分钟内校验成功过，则本次下载免校验
             String phoneKey = RedisKeys.getPrivaceDataEpidemicUserInfoKey(user.getMobile());
             Object value = redisUtils.get(phoneKey);
@@ -159,14 +159,14 @@ public class VerificationFreeUserServiceImpl extends BaseServiceImpl<Verificatio
 
     @Override
     public Result setAccessPermissions(VerificationFreeUserDTO dto) {
-        Boolean existBySysUserId = baseDao.isExistBySysUserId(dto.getSysUserId());
-        if (existBySysUserId) {
-            // 设置过了，修改
-            baseDao.updateVerificationFlagBySysUserId(dto);
-        } else {
+        Integer existBySysUserId = baseDao.isExistBySysUserId(dto.getSysUserId());
+        if (NumConstant.ZERO == existBySysUserId) {
             // 未设置，新增
             VerificationFreeUserEntity entity = ConvertUtils.sourceToTarget(dto, VerificationFreeUserEntity.class);
             insert(entity);
+        } else {
+            // 设置过了，修改
+            baseDao.updateVerificationFlagBySysUserId(dto);
         }
         return new Result();
     }
diff --git a/epdc-cloud-admin/src/main/resources/mapper/VerificationFreeUserDao.xml b/epdc-cloud-admin/src/main/resources/mapper/VerificationFreeUserDao.xml
index db2189c..1d6b9f0 100644
--- a/epdc-cloud-admin/src/main/resources/mapper/VerificationFreeUserDao.xml
+++ b/epdc-cloud-admin/src/main/resources/mapper/VerificationFreeUserDao.xml
@@ -15,21 +15,21 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
-    <select id="isVerificationBySysUserId" resultType="java.lang.Boolean">
+    <select id="isVerificationBySysUserId" resultType="java.lang.Integer">
         SELECT
-          SYS_USER_ID = #{sysUserId,jdbcType=BIGINT}
+          COUNT(id)
         FROM epdc_verification_free_user
         WHERE del_flag = '0'
         AND VERIFICATION_FLAG = '1'
-        LIMIT 1;
+        AND SYS_USER_ID = #{sysUserId,jdbcType=BIGINT};
     </select>
 
-    <select id="isExistBySysUserId" resultType="java.lang.Boolean">
+    <select id="isExistBySysUserId" resultType="java.lang.Integer">
         SELECT
-          SYS_USER_ID = #{sysUserId,jdbcType=BIGINT}
+          COUNT(id)
         FROM epdc_verification_free_user
         WHERE del_flag = '0'
-        LIMIT 1;
+        AND SYS_USER_ID = #{sysUserId,jdbcType=BIGINT};
     </select>
 
     <select id="selectListSysUserInfo" resultType="com.elink.esua.epdc.dto.VerificationFreeUserDTO">