Commit b33ba9f858f2a3b4ecef35e05fa4db274e9ca8fc
Exists in
master
and in
6 other branches
Merge remote-tracking branch 'origin/master'
Showing 1 changed file
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
View file @
b33ba9f
| ... | ... | @@ -1947,13 +1947,17 @@ |
| 1947 | 1947 | public BaseResponse addPrintSize(String sampleReportId) { |
| 1948 | 1948 | Query query = Query.query(Criteria.where("sampleReportId").is(sampleReportId)); |
| 1949 | 1949 | SieveResultModel resultModel = mongoTemplate.findOne(query, SieveResultModel.class); |
| 1950 | - Update update = new Update(); | |
| 1951 | - update.set("printSize", resultModel.getPrintSize().intValue()+ 1); | |
| 1952 | - Boolean hasReport = resultModel.getHasReport(); | |
| 1953 | - if (hasReport != null && hasReport == false) { | |
| 1954 | - update.set("hasReport", true); | |
| 1950 | + if (resultModel != null) { | |
| 1951 | + Integer printSize = (resultModel.getPrintSize() == null ? 0 : resultModel.getPrintSize())+1; | |
| 1952 | + | |
| 1953 | + Update update = new Update(); | |
| 1954 | + update.set("printSize", printSize); | |
| 1955 | + Boolean hasReport = resultModel.getHasReport(); | |
| 1956 | + if (hasReport != null && hasReport == false) { | |
| 1957 | + update.set("hasReport", true); | |
| 1958 | + } | |
| 1959 | + mongoTemplate.updateFirst(query, update, SieveResultModel.class); | |
| 1955 | 1960 | } |
| 1956 | - mongoTemplate.updateFirst(query, update, SieveResultModel.class); | |
| 1957 | 1961 | BaseResponse baseResponse = new BaseResponse(); |
| 1958 | 1962 | return baseResponse; |
| 1959 | 1963 | } |