代码合并

RMS/src/main/java/cn/cslg/report/service/business/AssoTaskPersonelService.java

@@ -95,8 +95,10 @@ public class AssoTaskPersonelService extends ServiceImpl<AssoTaskPersonelMapper,
         }
 
         patentVO.setPatentNos(patentNumber);
-
-        Integer totalNumber =  patentVO.getPatentNos().size();
+        String resNum = outInterfaceService.getConPantents(patentVO, 1);
+        JSONObject jsonObjectNum = JSONObject.parseObject(resNum);
+        List<JSONObject> jsonObjectNums = JSONArray.parseArray(jsonObjectNum.get("data").toString(), JSONObject.class);
+        Integer totalNumber = jsonObjectNums.size();
         if (patentVO.getLocPosition() == 1) {
             patentVO.setStartNumber(patentVO.getLocPosition() - 1);
             patentVO.setEndNumber(patentVO.getLocPosition());