diff --git a/src/main/java/com/weaver/seconddev/organization/entity/po/PositionData.java b/src/main/java/com/weaver/seconddev/organization/entity/po/PositionData.java index 48d30d1..e1f6c7a 100644 --- a/src/main/java/com/weaver/seconddev/organization/entity/po/PositionData.java +++ b/src/main/java/com/weaver/seconddev/organization/entity/po/PositionData.java @@ -13,5 +13,5 @@ public class PositionData { private String code; private String name; private String oDeptId; - private String isCanceled; + private String is_canceled; } diff --git a/src/main/java/com/weaver/seconddev/organization/service/impl/OrganizationInfoServiceImpl.java b/src/main/java/com/weaver/seconddev/organization/service/impl/OrganizationInfoServiceImpl.java index f461a79..aa5b51b 100644 --- a/src/main/java/com/weaver/seconddev/organization/service/impl/OrganizationInfoServiceImpl.java +++ b/src/main/java/com/weaver/seconddev/organization/service/impl/OrganizationInfoServiceImpl.java @@ -152,12 +152,11 @@ public class OrganizationInfoServiceImpl implements OrganizationInfoService { for (Map map : positionList) { PositionData positionData = new PositionData(); - positionData.setOId(Convert.toStr(map.get("oid"),"")); - positionData.setCode(Convert.toStr(map.get("positionCode"),"")); - positionData.setName(Convert.toStr(map.get("positionName"),"")); - positionData.setODeptId(Convert.toStr(map.get("odeptid"),"")); - positionData.setIsCanceled(Convert.toStr(map.get("is_canceled"),"")); - + positionData.setOId(Convert.toStr(map.get("oid"), "")); + positionData.setCode(Convert.toStr(map.get("positionCode"), "")); + positionData.setName(Convert.toStr(map.get("positionName"), "")); + positionData.setODeptId(Convert.toStr(map.get("odeptid"), "")); + positionData.setIs_canceled(Convert.toStr(map.get("canceled"), "0")); orgList.add(positionData); } diff --git a/src/main/resources/mapper/OrganizationInfoMapper.xml b/src/main/resources/mapper/OrganizationInfoMapper.xml index 48594a6..86aa7ec 100644 --- a/src/main/resources/mapper/OrganizationInfoMapper.xml +++ b/src/main/resources/mapper/OrganizationInfoMapper.xml @@ -81,7 +81,7 @@