diff --git a/src/main/java/cn/lihongjie/coal/session/service/SessionService.java b/src/main/java/cn/lihongjie/coal/session/service/SessionService.java
index d84c3212..a55e95a7 100644
--- a/src/main/java/cn/lihongjie/coal/session/service/SessionService.java
+++ b/src/main/java/cn/lihongjie/coal/session/service/SessionService.java
@@ -251,6 +251,11 @@ public class SessionService {
                         userService
                                 .findByUsername(dto.getUsername())
                                 .orElseThrow(() -> new BizException("用户名或者密码错误"));
+
+
+                if (!userService.isValidPassword(dto.getPassword(), user.getPassword())) {
+                    throw new BizException("用户名或者密码错误");
+                }
             }
 
             if (StringUtils.equalsIgnoreCase(dto.getLoginType(), "1")) {
@@ -290,6 +295,10 @@ public class SessionService {
                 user = trustDevice.get().getUser();
             }
 
+            if (user == null){
+                throw new BizException("用户不存在");
+            }
+
             if (user.isDisabled()) {
                 throw new BizException("用户被禁用");
             }
@@ -304,9 +313,7 @@ public class SessionService {
                 throw new BizException("用户所在机构已过期");
             }
 
-            if (!userService.isValidPassword(dto.getPassword(), user.getPassword())) {
-                throw new BizException("用户名或者密码错误");
-            }
+
 
             LoginUserEntity entity = new LoginUserEntity();
             entity.setEnv(dto.getEnv());
diff --git a/src/main/java/cn/lihongjie/coal/trustDevice/service/TrustDeviceService.java b/src/main/java/cn/lihongjie/coal/trustDevice/service/TrustDeviceService.java
index 06ab2adc..6e03e138 100644
--- a/src/main/java/cn/lihongjie/coal/trustDevice/service/TrustDeviceService.java
+++ b/src/main/java/cn/lihongjie/coal/trustDevice/service/TrustDeviceService.java
@@ -32,6 +32,7 @@ import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
 import java.util.Optional;
 
 @Service
@@ -94,8 +95,8 @@ public class TrustDeviceService extends BaseService<TrustDeviceEntity, TrustDevi
 
         UserEntity userEntity = userService.get(user.getId());
 
-        Optional<TrustDeviceEntity> one =
-                this.repository.findOne(
+        List<TrustDeviceEntity> all =
+                this.repository.findAll(
                         new Specification<TrustDeviceEntity>() {
                             @Override
                             public Predicate toPredicate(
@@ -104,14 +105,17 @@ public class TrustDeviceService extends BaseService<TrustDeviceEntity, TrustDevi
                                     CriteriaBuilder criteriaBuilder) {
 
                                 return criteriaBuilder.and(
-                                        criteriaBuilder.equal(
-                                                root.get("user").get("id"), userEntity.getId()),
                                         criteriaBuilder.equal(root.get("code"), dto.getCode()));
                             }
                         });
 
-        if (one.isPresent()) {
-            return;
+        if (!all.isEmpty()) {
+
+            if (all.stream().allMatch(x -> x.getUser().getId().equals(userEntity.getId()))) {
+                return;
+            } else {
+                throw new BizException("设备已被其他人添加，无法重复添加");
+            }
         }
 
         TrustDeviceEntity entity = new TrustDeviceEntity();
@@ -125,20 +129,15 @@ public class TrustDeviceService extends BaseService<TrustDeviceEntity, TrustDevi
 
     public Optional<TrustDeviceEntity> getByCode(String trustDeviceCode) {
 
-
-
-        return this.repository
-                .findOne(
-                        new Specification<TrustDeviceEntity>() {
-                            @Override
-                            public Predicate toPredicate(
-                                    Root<TrustDeviceEntity> root,
-                                    CriteriaQuery<?> query,
-                                    CriteriaBuilder criteriaBuilder) {
-                                return criteriaBuilder.equal(root.get("code"), trustDeviceCode);
-                            }
-                        });
-
-
+        return this.repository.findOne(
+                new Specification<TrustDeviceEntity>() {
+                    @Override
+                    public Predicate toPredicate(
+                            Root<TrustDeviceEntity> root,
+                            CriteriaQuery<?> query,
+                            CriteriaBuilder criteriaBuilder) {
+                        return criteriaBuilder.equal(root.get("code"), trustDeviceCode);
+                    }
+                });
     }
 }