校验客户主账号

src/main/java/common/service/impl/ContractServiceImpl.java

@@ -215,18 +215,20 @@ public class ContractServiceImpl implements ContractService {
     public Map<String, Object> checkAccount(String email, String platfrom) {
         Map<String, Object> map = new HashMap<>();
         Account4Web account4Web = null;
+        Account account = null;
         IOAccount4Web ioAccount4Web = null;
         ADIUser adiUser = null;
         platfrom = "tkio";
 
         if ("tkio".equals(platfrom)) {
-            account4Web = account4WebRepository.findByEmail(email);
+            //account4Web = account4WebRepository.findByEmail(email);
+            account = accountRepository.findByEmail(email);
         } else if ("io".equals(platfrom)) {
             ioAccount4Web = ioAccount4WebRepository.findByEmail(email);
         } else if ("adi".equals(platfrom)) {
             adiUser = adiAccountService.findOne(email);
         }
-        if (null == account4Web && null == ioAccount4Web && null == adiUser) {
+        if (null == account && null == ioAccount4Web && null == adiUser) {
             map.put("result", 0);
         } else {
             BigInteger integer = contractRepository.countNumByEmail(email, platfrom);
@@ -234,7 +236,8 @@ public class ContractServiceImpl implements ContractService {
             if (platfrom.equals("adi")) {
                 map.put("company", adiUser.getCompany());
             } else {
-                map.put("company", null == account4Web ? ioAccount4Web.getCompany() : account4Web.getCompany());
+                // map.put("company", null == account4Web ? ioAccount4Web.getCompany() : account4Web.getCompany());
+                map.put("company", account.getCompany());
             }
 
             map.put("num", integer.intValue());