Merge remote-tracking branch 'remotes/origin/dev_fegin_concurrent' into pingyin_master

epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java

@@ -604,7 +604,16 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol
                 result.getMsg()));
         return new ArrayList<>();
     }
-
+    //临时解决方案
+    private static final  List<StaffOrgsResultDTO> resultTemp = new ArrayList<>();
+     static {
+         StaffOrgsResultDTO t = new StaffOrgsResultDTO();
+         t.setRootAgencyId("53613e1c5de6ed473467f0159a10b135");
+         t.setRootAgencyName("平阴县");
+         t.setCustomerId("6f203e30de1a65aab7e69c058826cd80");
+         t.setCustomerName("平音");
+         resultTemp.add(t);
+    }
     @Override
     public List<StaffOrgsResultDTO> getMyOrgByAccount(ThirdStaffOrgByAccountFormDTO formDTO) {
         String appId = formDTO.getAppId();
@@ -616,8 +625,8 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol
                 if ("Py011111".equals(password)){
                     throw new RenException(EpmetErrorCode.PASSWORD_ERROR.getCode());
                 }
-                String result = "[{\"rootAgencyId\":\"53613e1c5de6ed473467f0159a10b135\",\"rootAgencyName\":\"平阴县\",\"customerId\":\"6f203e30de1a65aab7e69c058826cd80\",\"customerName\":\"平音\"}]";
+                //String result = "[{\"rootAgencyId\":\"53613e1c5de6ed473467f0159a10b135\",\"rootAgencyName\":\"平阴县\",\"customerId\":\"6f203e30de1a65aab7e69c058826cd80\",\"customerName\":\"平音\"}]";
-                return JSON.parseArray(result,StaffOrgsResultDTO.class);
+                return resultTemp;
             }
             if (userAccount.startsWith("187000111")){
                 throw new EpmetException(EpmetErrorCode.GOV_STAFF_ACCOUNT_NOT_EXISTS.getCode());