Merge remote-tracking branch 'origin/master'

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/service/CwProjectRecordsService.java

@@ -136,7 +136,7 @@ public class CwProjectRecordsService extends ServiceImpl<CwProjectRecordsMapper,
             // 创建人
             if (ObjectUtil.isNotEmpty(cwProjectRecordsDTO.getCreateBy())) {
                 if (StringUtils.isNotBlank(cwProjectRecordsDTO.getCreateBy().getName())) {
-                    queryWrapper.in("a.create_by_id", cwProjectRecordsDTO.getCreateBy().getName()).or().like("su.name", cwProjectRecordsDTO.getCreateBy().getName());
+                    queryWrapper.in("a.create_by_id", cwProjectRecordsDTO.getCreateBy().getId()).or().like("su.name", cwProjectRecordsDTO.getCreateBy().getName());
                 }
             }
             //报告日期