Merge branch 'master' of http://192.168.31.17:3000/VoRDM/vordm-backend
This commit is contained in:
commit
1c87d2825f
|
@ -54,6 +54,9 @@ public class ToolController{
|
||||||
if(tool.getUploader()!=null) {
|
if(tool.getUploader()!=null) {
|
||||||
queryWrapper.eq("uploader", tool.getUploader());
|
queryWrapper.eq("uploader", tool.getUploader());
|
||||||
}
|
}
|
||||||
|
if(!StringUtils.isEmpty(tool.getRelatedDisasterType())) {
|
||||||
|
queryWrapper.eq("related_disaster_type", tool.getRelatedDisasterType());
|
||||||
|
}
|
||||||
String checkd = tool.getChecked();
|
String checkd = tool.getChecked();
|
||||||
if(checkd != null && checkd.equals("1")){
|
if(checkd != null && checkd.equals("1")){
|
||||||
queryWrapper.isNull("review_time");
|
queryWrapper.isNull("review_time");
|
||||||
|
|
Loading…
Reference in New Issue