Commit 31ca06df authored by renjie's avatar renjie

ip bug

parent fa200799
...@@ -84,6 +84,7 @@ public class CompanyAuthorizeRepositoryCustomImpl implements CompanyAuthorizeRep ...@@ -84,6 +84,7 @@ public class CompanyAuthorizeRepositoryCustomImpl implements CompanyAuthorizeRep
File file = new File(gridFSFile.getFilename() + ".png"); File file = new File(gridFSFile.getFilename() + ".png");
FileOutputStream out = new FileOutputStream(file); FileOutputStream out = new FileOutputStream(file);
out.write(f); out.write(f);
out.close();
return file; return file;
} catch (Exception e) { } catch (Exception e) {
logger.error(e.getMessage()); logger.error(e.getMessage());
......
...@@ -65,7 +65,7 @@ public class IpResourceRepositoryCustomImpl implements IpResourceRepositoryCusto ...@@ -65,7 +65,7 @@ public class IpResourceRepositoryCustomImpl implements IpResourceRepositoryCusto
public List<IpResource> sampleTasks(int status, long timestamp) { public List<IpResource> sampleTasks(int status, long timestamp) {
Criteria matchCriteria = new Criteria(); Criteria matchCriteria = new Criteria();
matchCriteria.orOperator(where("status").is(status).and("isLocked").is(false).and("isDeleted").is(false), matchCriteria.orOperator(where("status").is(status).and("isLocked").is(false).and("isDeleted").is(false),
where("isLocked").is(true).and("lockTimeStamp").lte(timestamp)).and("isDeleted").is(false); where("isLocked").is(true).and("lockTimestamp").lte(timestamp)).and("isDeleted").is(false);
MatchOperation match = Aggregation.match(matchCriteria); MatchOperation match = Aggregation.match(matchCriteria);
......
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