|
|
|
@ -12,7 +12,6 @@ import org.slf4j.LoggerFactory;
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
import org.springframework.stereotype.Component;
|
|
|
|
|
|
|
|
|
|
import java.text.SimpleDateFormat;
|
|
|
|
|
import java.time.LocalDate;
|
|
|
|
|
import java.time.Period;
|
|
|
|
|
import java.util.*;
|
|
|
|
@ -350,12 +349,12 @@ public class CockpitUserDataCmd {
|
|
|
|
|
|
|
|
|
|
Map<String, Object> result = databaseUtils.executeForQuery(sourceType, groupId, sql, sqlparam);
|
|
|
|
|
recordList = databaseUtils.getDataSourceList(result);
|
|
|
|
|
if (recordList.size() < 4) {
|
|
|
|
|
for (int i = 0; i < (4 - recordList.size()); i++) {
|
|
|
|
|
Map<String, Object> nullMap = new HashMap<String, Object>();
|
|
|
|
|
recordList.add(nullMap);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
// if (recordList.size() < 4) {
|
|
|
|
|
// for (int i = 0; i < (4 - recordList.size()); i++) {
|
|
|
|
|
// Map<String, Object> nullMap = new HashMap<String, Object>();
|
|
|
|
|
// recordList.add(nullMap);
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
e.printStackTrace();
|
|
|
|
|
log.error("getRightViewData:" + e);
|
|
|
|
|