Browse Source

bug优化

admin 2 years ago
parent
commit
2e85333f81

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

@@ -348,9 +348,10 @@ public class UserWhitelistServiceImpl implements UserWhitelistService {
         }
         List<String> faceDeviceOne = faceDeviceDao.selectList(one.getAdminId());
         if (faceDeviceOne.isEmpty()) {
-            objectRestResult.setCode(401);
-            objectRestResult.setMsg("设备不在线常客名单全量失败");
-            return objectRestResult;
+            //objectRestResult.setCode(401);
+            //objectRestResult.setMsg("设备不在线常客名单全量失败");
+            throw new ServiceException("设备不在线常客名单全量失败");
+            //return objectRestResult;
         }
         //人脸下发
         Date now = new Date();

+ 8 - 6
src/main/resources/mapper/UserWhitelistDao.xml

@@ -93,11 +93,11 @@
           AND uw.admin_id = #{userId}
     </select>
     <select id="selectListOne" resultType="com.yx.face.model.vo.UserWhitelistVO">
-  `      SELECT ui.id, uw.id as snId, uw.avatar, ui.username as name, ui.id_number as idNumber, uw.admin_id as adminId
-        FROM user_whitelist as uw
-                 LEFT JOIN user_info as ui
-                           on uw.phone = ui.phone
-        WHERE uw.id = #{id}`
+              SELECT ui.id, uw.id as snId, uw.avatar, ui.username as name, ui.id_number as idNumber, uw.admin_id as adminId
+              FROM user_whitelist as uw
+                       LEFT JOIN user_info as ui
+                                 on uw.phone = ui.phone
+              WHERE uw.id = #{id}
     </select>
     <select id="selectId" resultType="java.lang.Long">
         SELECT uw.id
@@ -133,7 +133,9 @@
     </select>
 
     <select id="getByIdNubmer" resultType="com.yx.face.model.entity.UserWhitelist">
-        select id from user_whitelist where id_number=#{idNumber}
+        select id
+        from user_whitelist
+        where id_number = #{idNumber}
     </select>
 </mapper>