|
|
|
@ -611,9 +611,15 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
|
|
|
|
|
Map<String, Object> datas = new HashMap<>();
|
|
|
|
|
RecordSet rs = new RecordSet();
|
|
|
|
|
String fclass = Util.null2String(params.get("fclass"));
|
|
|
|
|
String timeName = Util.null2String(params.get("timeName"));
|
|
|
|
|
List<TimeLinesBO> timeLinesBOList = new ArrayList<>();
|
|
|
|
|
timeLinesBOList.add(TimeLinesBO.builder().key(0).id(0).title("当前版本").color("blue").time("").build());
|
|
|
|
|
rs.executeQuery("SELECT id,recorddate,description from JCL_ORG_CHARTVERSION where fclass = ? and deletetype = ? order by id desc", fclass, 0);
|
|
|
|
|
String sql = "SELECT id,recorddate,description from JCL_ORG_CHARTVERSION where fclass = ? and deletetype = ?";
|
|
|
|
|
if (StringUtils.isNotEmpty(timeName)) {
|
|
|
|
|
sql += " and description like '%"+timeName+"%'";
|
|
|
|
|
}
|
|
|
|
|
sql += " order by id desc";
|
|
|
|
|
rs.executeQuery(sql, fclass, 0);
|
|
|
|
|
while (rs.next()) {
|
|
|
|
|
timeLinesBOList.add(TimeLinesBO.builder()
|
|
|
|
|
.key(rs.getInt("id"))
|
|
|
|
|