diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java index 580fec4d..995404a7 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java @@ -1544,7 +1544,11 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService { // 构建搜索条件 String orderBy = "order by create_time desc"; parameterMapByDomestic.put(FieldCommon.MODULE, TableNameEnum.DOMESTIC_REGULATIONS.getValue()); - parameterMapByEnterprise.put(FieldCommon.MODULE, TableNameEnum.DOMESTIC_REGULATIONS.getValue()); + parameterMapByEnterprise.put(FieldCommon.MODULE, TableNameEnum.ENTERPRISE_STANDARDS.getValue()); + // 关联部门字段不一致 特殊处理 + if (parameterMap.containsKey("associate_dept")){ + parameterMapByEnterprise.put("related_department", parameterMap.get("associate_dept")); + } String queryConditionByDomestic = lawsCommonService.buildQueryCondition(parameterMapByDomestic).replace(orderBy, ""); String queryConditionByEnterprise = @@ -1573,6 +1577,10 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService { Date releaseDate = (Date) data.get("release_date"); data.put("release_date", new SimpleDateFormat(YYYY_MM_DD).format(releaseDate)); } + if (!Objects.isNull(data.get("implementation_date"))){ + Date implementationDate = (Date) data.get("implementation_date"); + data.put("implementation_date", new SimpleDateFormat(YYYY_MM_DD).format(implementationDate)); + } } return Result.OK(advancedSearchAll); }