[修改] orgEopage

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

adc-da-sys/src/main/java/com/adc/da/sys/service/OrgEOService.java

@@ -49,7 +49,6 @@ public class OrgEOService extends ServiceImpl<OrgEODao, OrgEO> implements IOrgEo
     }
 
     public IPage<OrgEO> selectPage(OrgEOPage orgEOPage) {
-        orgEOPage.setStatus(1);
         Page<OrgEO> page = new Page<>(orgEOPage.getPage(), orgEOPage.getPageSize());
         IPage<OrgEO> orgEOIPage = baseMapper.selectPageByVO(page,orgEOPage);
         return orgEOIPage;

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}
     </select>