修改积分串并

src/main/java/com/founder/interservice/gwdq/Controller/GwdqfxtjController.java

@@ -38,6 +38,7 @@ public class GwdqfxtjController {
         //passWord解密
         passWord = getDecryptPsw(passWord);
 
+
         //登录采集
         CloseableHttpClient httpclient = gwdqService.getCjxm(userName, passWord, sfzh, userCode);
         //response返回的相应实体
@@ -80,15 +81,14 @@ public class GwdqfxtjController {
     @RequestMapping(value = "/tojfcb", method = {RequestMethod.GET, RequestMethod.POST})
     @ResponseBody
     public List<TbStJfcb> getJfcb(String asjbh, String userName, String passWord, String sfzh, String userCode){
+        List<TbStJfcb> list = new ArrayList<>();
+        if(!"".equals(asjbh)&&null!=asjbh){
         //passWord解密
         passWord = getDecryptPsw(passWord);
-
         //登录采集
         CloseableHttpClient httpclient = gwdqService.getCjxm(userName, passWord, sfzh, userCode);
-
         //response返回的相应实体
         UrlEncodedFormEntity reqEntity = null;
-
         //建立一个NameValuePair数组，用于存储欲传送的参数
         List<NameValuePair> formparams = new ArrayList<>();
         formparams.clear();
@@ -100,7 +100,6 @@ public class GwdqfxtjController {
         }
         HttpPost post = new HttpPost(cjJfcbUrl);
         post.setEntity(reqEntity);
-        List<TbStJfcb> list = new ArrayList<>();
         String content = gwdqService.RequestUtil(httpclient, post).trim();
         System.out.println("content=="+content);
         if(null != content && !"".equals(content)){
@@ -109,6 +108,7 @@ public class GwdqfxtjController {
                 list = jsonArray.toJavaList(TbStJfcb.class);
             }
         }
+       }
         return list;
     }