|
@@ -106,9 +106,11 @@ public class IndicatorServiceImpl extends ServiceImpl<IndicatorMapper, Indicator
|
|
|
@Override
|
|
|
public List<Indicator> listAll(String id, String indicatorName, String indicatorCode, String binSection, String binStage, String dept, String company,String evaluationCycle) {
|
|
|
|
|
|
-
|
|
|
- evaluationCycle = evaluationCycle.replaceAll("ALL","");
|
|
|
- List<Indicator> list = baseMapper.seleclistAll(id, indicatorName, indicatorCode, binSection, binStage, dept, company,evaluationCycle);
|
|
|
+ List<Indicator> list = null;
|
|
|
+ if (evaluationCycle.length() > 0){
|
|
|
+ evaluationCycle = evaluationCycle.replaceAll("ALL","");
|
|
|
+ list = baseMapper.seleclistAll(id, indicatorName, indicatorCode, binSection, binStage, dept, company,evaluationCycle);
|
|
|
+ }
|
|
|
return list;
|
|
|
}
|
|
|
|