QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(88014): 高级检索-全部 对以下字段进行搜索提示操作失败

Browse Source
This commit is contained in:
yjz
2024-08-02 10:56:31 +08:00
parent dabbe71829
commit d623d89e94
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java
+9 -1
View File
@@ -1544,7 +1544,11 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
// 构建搜索条件 // 构建搜索条件
String orderBy = "order by create_time desc"; String orderBy = "order by create_time desc";
parameterMapByDomestic.put(FieldCommon.MODULE, TableNameEnum.DOMESTIC_REGULATIONS.getValue()); 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 = String queryConditionByDomestic =
lawsCommonService.buildQueryCondition(parameterMapByDomestic).replace(orderBy, ""); lawsCommonService.buildQueryCondition(parameterMapByDomestic).replace(orderBy, "");
String queryConditionByEnterprise = String queryConditionByEnterprise =
@@ -1573,6 +1577,10 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
Date releaseDate = (Date) data.get("release_date"); Date releaseDate = (Date) data.get("release_date");
data.put("release_date", new SimpleDateFormat(YYYY_MM_DD).format(releaseDate)); 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); return Result.OK(advancedSearchAll);
} }