master
parent
d257a6077a
commit
73159cecd7
|
@ -89,7 +89,6 @@ public class SpaceService {
|
||||||
queryHelper.addCondition("p.approve_status_estimate>=1 and p.approve_status_estimate<=2");
|
queryHelper.addCondition("p.approve_status_estimate>=1 and p.approve_status_estimate<=2");
|
||||||
}
|
}
|
||||||
|
|
||||||
if(StrUtil.isNotEmpty(searchInfo.get("extend")) && "0".equals(searchInfo.get("extend"))) {
|
|
||||||
if (StrUtil.isNotEmpty(searchInfo.get("isSecond")) && !"-1".equals(searchInfo.get("isSecond"))) {
|
if (StrUtil.isNotEmpty(searchInfo.get("isSecond")) && !"-1".equals(searchInfo.get("isSecond"))) {
|
||||||
queryHelper.addCondition("p.is_second=?", Integer.parseInt(searchInfo.get("isSecond")));
|
queryHelper.addCondition("p.is_second=?", Integer.parseInt(searchInfo.get("isSecond")));
|
||||||
}
|
}
|
||||||
|
@ -123,7 +122,6 @@ public class SpaceService {
|
||||||
String time = searchInfo.get("contractEndTime") + " 00:00:00";
|
String time = searchInfo.get("contractEndTime") + " 00:00:00";
|
||||||
queryHelper.addCondition("p.contract_time<=?", time);
|
queryHelper.addCondition("p.contract_time<=?", time);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
//项目可见性,根据角色和人员id
|
//项目可见性,根据角色和人员id
|
||||||
Admin admin = InterfaceUtil.getAdmin();
|
Admin admin = InterfaceUtil.getAdmin();
|
||||||
|
|
Loading…
Reference in New Issue