Commit 42937b2a authored by shiyu's avatar shiyu

列表排除国外的钱币

parent 8b5f29ae
...@@ -71,6 +71,7 @@ public class ItemDaoImpl implements ItemDao { ...@@ -71,6 +71,7 @@ public class ItemDaoImpl implements ItemDao {
criteria.andSourceNotEqualTo(2); criteria.andSourceNotEqualTo(2);
criteria.andSourceNotEqualTo(7); criteria.andSourceNotEqualTo(7);
} }
criteria.andSourceIn(CHINESE_SOURCE_LIST);
example.orderBy("update_time desc"); example.orderBy("update_time desc");
JdbcHelper.ifPresent(coinRequestDto.getId(), criteria :: andIdEqualTo); JdbcHelper.ifPresent(coinRequestDto.getId(), criteria :: andIdEqualTo);
if (StringUtils.hasLength(coinRequestDto.getName())) { if (StringUtils.hasLength(coinRequestDto.getName())) {
...@@ -313,9 +314,9 @@ public class ItemDaoImpl implements ItemDao { ...@@ -313,9 +314,9 @@ public class ItemDaoImpl implements ItemDao {
ItemExample example = new ItemExample(); ItemExample example = new ItemExample();
ItemExample.Criteria criteria = example.createCriteria(); ItemExample.Criteria criteria = example.createCriteria();
criteria.andIsDeletedEqualTo(false); criteria.andIsDeletedEqualTo(false);
// 暂时去除华夏古泉和天眷堂的钱币, 对应编码1和7 // 暂时去除华夏古泉和天眷堂的钱币, 对应编码2和7
if (!ObjectUtils.isEmpty(coinRequestDto.getIsExcluded()) && coinRequestDto.getIsExcluded() == 1) { if (!ObjectUtils.isEmpty(coinRequestDto.getIsExcluded()) && coinRequestDto.getIsExcluded() == 1) {
criteria.andSourceNotEqualTo(1); criteria.andSourceNotEqualTo(2);
criteria.andSourceNotEqualTo(7); criteria.andSourceNotEqualTo(7);
} }
if (StringUtils.hasLength(coinRequestDto.getName())) { if (StringUtils.hasLength(coinRequestDto.getName())) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment