fix 标协会员查询企业名称报错
This commit is contained in:
+8
-1
@@ -613,11 +613,18 @@ public class ITbMemberProjectSubitemService extends ServiceImpl<TbMemberProjectS
|
||||
}
|
||||
|
||||
private QueryWrapper<TbMemberProjectSubitem> generateQueryWrapper(HttpServletRequest request, TbMemberProjectSubitem tbMemberProjectSubitem){
|
||||
QueryWrapper<TbMemberProjectSubitem> queryWrapper = QueryGenerator.initQueryWrapper(tbMemberProjectSubitem, request.getParameterMap());
|
||||
Map<String, String[]> parameterMap = request.getParameterMap();
|
||||
String[] strings = parameterMap.get("companyName");
|
||||
parameterMap.remove("companyName");
|
||||
tbMemberProjectSubitem.setCompanyName(null);
|
||||
QueryWrapper<TbMemberProjectSubitem> queryWrapper = QueryGenerator.initQueryWrapper(tbMemberProjectSubitem, parameterMap);
|
||||
String invalidationDateStr = tbMemberProjectSubitem.getInvalidationDateStr();
|
||||
String effectiveDateStr = tbMemberProjectSubitem.getEffectiveDateStr();
|
||||
String estimatedArrivalDateBegin = tbMemberProjectSubitem.getEstimatedArrivalDate_begin();
|
||||
String estimatedArrivalDateEnd = tbMemberProjectSubitem.getEstimatedArrivalDate_end();
|
||||
if (strings != null){
|
||||
queryWrapper.like("pcm.company_name",strings[0]);
|
||||
}
|
||||
if (StringUtils.isNotBlank(invalidationDateStr)){
|
||||
DateTime invalidationDate = DateUtil.parse(invalidationDateStr, DatePattern.NORM_MONTH_PATTERN);
|
||||
queryWrapper.eq("year(invalidation_date)",invalidationDate.year());
|
||||
|
||||
Reference in New Issue
Block a user