潘钊 / bsth_control · Commits

Commit dc8e9be5e864633a3cc3f2ec607d7e2102ffa22d

Authored by 娄高锋
1 parent 54d6fb2b
build: skipped

update

Inline Side-by-side
Showing 1 changed file with 3 additions and 3 deletions
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
  View file @dc8e9be
@@ -1895,7 +1895,7 @@ public class ReportServiceImpl implements ReportService{ @@ -1895,7 +1895,7 @@ public class ReportServiceImpl implements ReportService{
1895 if(cts != null && cts.size() > 0){ 1895 if(cts != null && cts.size() > 0){
1896 lists.add(s); 1896 lists.add(s);
1897 }else{ 1897 }else{
1898 - if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){ 1898 + if(s.getZdsjActual()!=null && s.getFcsjActual()!=null && s.getZdsjActual().length() > 0 && s.getFcsjActual().length() > 0){
1899 lists.add(s); 1899 lists.add(s);
1900 } 1900 }
1901 } 1901 }
@@ -2633,7 +2633,7 @@ public class ReportServiceImpl implements ReportService{ @@ -2633,7 +2633,7 @@ public class ReportServiceImpl implements ReportService{
2633 if(cts != null && cts.size() > 0){ 2633 if(cts != null && cts.size() > 0){
2634 lists.add(s); 2634 lists.add(s);
2635 }else{ 2635 }else{
2636 - if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){ 2636 + if(s.getZdsjActual()!=null && s.getFcsjActual()!=null && s.getZdsjActual().length() > 0 && s.getFcsjActual().length() > 0){
2637 lists.add(s); 2637 lists.add(s);
2638 } 2638 }
2639 } 2639 }
@@ -3243,7 +3243,7 @@ public class ReportServiceImpl implements ReportService{ @@ -3243,7 +3243,7 @@ public class ReportServiceImpl implements ReportService{
3243 if(cts != null && cts.size() > 0){ 3243 if(cts != null && cts.size() > 0){
3244 type_=true; 3244 type_=true;
3245 }else{ 3245 }else{
3246 - if(sinfo.getZdsjActual()!=null && sinfo.getFcsjActual()!=null){ 3246 + if(sinfo.getZdsjActual()!=null && sinfo.getFcsjActual()!=null && sinfo.getZdsjActual().length() > 0 && sinfo.getFcsjActual().length() > 0){
3247 type_=true; 3247 type_=true;
3248 } 3248 }
3249 } 3249 }