diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/srms/controller/SrmsApiController.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/srms/controller/SrmsApiController.java index 91186f7b..7a74f7ae 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/srms/controller/SrmsApiController.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/srms/controller/SrmsApiController.java @@ -99,7 +99,7 @@ public class SrmsApiController { } List list = re.getResult(); JSONObject jsonResponses = ResponsesUtil.getJsonOk(); - jsonResponses.put("Rows",JSON.toJSONString(list)); + jsonResponses.put("result",JSON.toJSONString(list)); return ResponsesUtil.getJsonResult(json.get(MESSAGE_HEADER),jsonResponses); }catch (Exception e){ log.error("获取所有体系数据异常:",e); diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/srms/mapper/xml/LawsStandardMapper.xml b/laws-modules-docking/src/main/java/com/jero/modules/docking/srms/mapper/xml/LawsStandardMapper.xml index 8ce573c0..0edf0d02 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/srms/mapper/xml/LawsStandardMapper.xml +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/srms/mapper/xml/LawsStandardMapper.xml @@ -56,7 +56,7 @@ left join sar_file_split_info s1 on s1.standard_id = law.id and s1.file_type = 'publish_of_original' and s1.publish_before_id is null and s1.del_flag = 0 - and l1.name = #{standard.partCategoryName} + and l1.name like concat(concat('%',#{standard.partCategoryName}),'%') and s1.split_result = '成功' diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/srms/service/impl/SrmsApiServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/srms/service/impl/SrmsApiServiceImpl.java index 8f199309..6d21fb9f 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/srms/service/impl/SrmsApiServiceImpl.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/srms/service/impl/SrmsApiServiceImpl.java @@ -288,12 +288,13 @@ public class SrmsApiServiceImpl implements SrmsApiService { if(StringUtils.isBlank(token) || !Objects.equals(TokenUtils.getTokenByRequest(req),token)){ return Result.error(SYS_ERR); } - JSONArray requests = JSON.parseArray(JSON.toJSONString(json.get(REQUESTS))); - if(CollectionUtils.isEmpty(requests)){ + JSONObject requests = JSON.parseObject(JSON.toJSONString(json.get(REQUESTS))); + JSONArray rows = JSON.parseArray(JSON.toJSONString(requests.get("Rows"))); + if(CollectionUtils.isEmpty(rows)){ return Result.error(ADD_NOT_NULL); } List listProductDesign = new ArrayList<>(); - for (Object request : requests) { + for (Object request : rows) { JSONObject js = JSON.parseObject(JSON.toJSONString(request)); // todo || !js.containsKey("queryLabels") if(!js.containsKey("ID") || !js.containsKey(STANDARD_NUMBER) ){