|
@@ -51,14 +51,17 @@ public class LocationCityPlugin {
|
|
DynamicObject userInfo = QueryServiceHelper.queryOne("bos_user", "id,number", new QFilter("id", QCP.equals, userId).toArray());
|
|
DynamicObject userInfo = QueryServiceHelper.queryOne("bos_user", "id,number", new QFilter("id", QCP.equals, userId).toArray());
|
|
DynamicObject hrPerson = QueryServiceHelper.queryOne("hrpi_person", "id", new QFilter[]{
|
|
DynamicObject hrPerson = QueryServiceHelper.queryOne("hrpi_person", "id", new QFilter[]{
|
|
new QFilter("number", QCP.equals, userInfo.getString("number")),
|
|
new QFilter("number", QCP.equals, userInfo.getString("number")),
|
|
- new QFilter("iscurrentversion", QCP.equals, Boolean.TRUE)
|
|
|
|
|
|
+ new QFilter("iscurrentversion", QCP.equals, Boolean.TRUE),
|
|
|
|
+ new QFilter("datastatus", QCP.equals, "1"),
|
|
});
|
|
});
|
|
|
|
|
|
if(hrPerson != null){
|
|
if(hrPerson != null){
|
|
logger.info("hrPerson_id:" + hrPerson.getLong("id"));
|
|
logger.info("hrPerson_id:" + hrPerson.getLong("id"));
|
|
DynamicObject baseLocation = QueryServiceHelper.queryOne("hrpi_baselocation", "location.city.id", new QFilter[]{
|
|
DynamicObject baseLocation = QueryServiceHelper.queryOne("hrpi_baselocation", "location.city.id", new QFilter[]{
|
|
new QFilter("person", QCP.equals, hrPerson.getLong("id")),
|
|
new QFilter("person", QCP.equals, hrPerson.getLong("id")),
|
|
- new QFilter("iscurrentversion", QCP.equals, Boolean.TRUE)
|
|
|
|
|
|
+ new QFilter("iscurrentversion", QCP.equals, Boolean.TRUE),
|
|
|
|
+ new QFilter("datastatus", QCP.equals, "1"),
|
|
|
|
+ new QFilter("businessstatus", QCP.equals, "1")
|
|
});
|
|
});
|
|
|
|
|
|
if(baseLocation != null){
|
|
if(baseLocation != null){
|