diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/page/OrgEOPage.java b/adc-da-sys/src/main/java/com/adc/da/sys/page/OrgEOPage.java index 1ad5f27..ca10960 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/page/OrgEOPage.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/page/OrgEOPage.java @@ -12,7 +12,7 @@ public class OrgEOPage extends BasePage { /** * 部门编码 */ - private String orgCode; + private String DepartmentCode; /** * 唯一值 @@ -22,7 +22,7 @@ public class OrgEOPage extends BasePage { /** * 部门名称 */ - private String orgName; + private String LongName; /** * 部门级别 @@ -49,10 +49,6 @@ public class OrgEOPage extends BasePage { */ private String bmdm14; - /** - * 状态,1正常,0停用,-1删除 - */ - private Integer status; /** * 更新时间,格式:yyyy-MM-dd HH:mm:ss diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/OrgEOService.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/OrgEOService.java index 88eeb2b..fdaee37 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/OrgEOService.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/OrgEOService.java @@ -49,7 +49,6 @@ public class OrgEOService extends ServiceImpl implements IOrgEo } public IPage selectPage(OrgEOPage orgEOPage) { - orgEOPage.setStatus(1); Page page = new Page<>(orgEOPage.getPage(), orgEOPage.getPageSize()); IPage orgEOIPage = baseMapper.selectPageByVO(page,orgEOPage); return orgEOIPage; diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml index ad2ca14..d680293 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml @@ -116,7 +116,7 @@ left join TR_USER_ROLE ur on u.usid = ur.user_id left join TS_ROLE r on ur.role_id = r.id left join TR_USER_org uo on u.usid = uo.user_id - left join TS_org org on uo.org_id = org.DEPARTMENT_CODE + left join TS_org org on uo.org_id = org.id where u.usid = #{id}