zhouweidong 发布系统代码 [ibz-ou，统一组织单位]

e28bcf64 · ibizdev · 93ea9c95 · e28bcf64 · e28bcf64 · e28bcf64
--- a/config.xml
+++ b/config.xml
@@ -37,11 +37,6 @@
 	  git clone -b master $para2 ibzou/
      export NODE_OPTIONS=--max-old-space-size=4096
      cd ibzou/
-      mvn clean package -Pweb
-      cd ibzou-app/ibzou-app-web
-      mvn -Pweb docker:build
-      mvn -Pweb docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/ibzou-app-web.yaml ibzlab-rt --with-registry-auth
      </command>
    </hudson.tasks.Shell>
  </builders>

--- a/ibzou-app/ibzou-app-web/src/main/docker/Dockerfile
+++ b/ibzou-app/ibzou-app-web/src/main/docker/Dockerfile
@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
    sleep ${IBIZ_SLEEP} && \
    java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzou-app-web.jar

-EXPOSE 30001
+EXPOSE 8080

 ADD ibzou-app-web.jar /ibzou-app-web.jar
--- a/ibzou-app/ibzou-app-web/src/main/docker/ibzou-app-web.yaml
+++ b/ibzou-app/ibzou-app-web/src/main/docker/ibzou-app-web.yaml
@@ -3,23 +3,9 @@ services:
  ibzou-app-web:
    image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzou-app-web:latest
    ports:
-      - "30001:30001"
+      - "8080:8080"
    networks:
      - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
-      - SERVER_PORT=30001
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.100.243:8848
-      - SPRING_REDIS_HOST=172.16.100.243
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
-      - SPRING_DATASOURCE_PASSWORD=@6dEfb3@
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
-      - NACOS=172.16.100.243:8848
-      - SPRING_CLOUD_NACOS_DISCOVERY_GROUP=ibizdev
    deploy:
      resources:
           limits:

--- a/ibzou-core/src/main/java/cn/ibizlab/core/ou/service/ISysDepartmentService.java
+++ b/ibzou-core/src/main/java/cn/ibizlab/core/ou/service/ISysDepartmentService.java
@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
 * 实体[SysDepartment] 服务对象接口
 */
+@com.baomidou.dynamic.datasource.annotation.DS("db2")
 public interface ISysDepartmentService extends IService<SysDepartment> {

    boolean create(SysDepartment et);

--- a/ibzou-core/src/main/java/cn/ibizlab/core/ou/service/ISysDeptMemberService.java
+++ b/ibzou-core/src/main/java/cn/ibizlab/core/ou/service/ISysDeptMemberService.java
@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
 * 实体[SysDeptMember] 服务对象接口
 */
+@com.baomidou.dynamic.datasource.annotation.DS("db2")
 public interface ISysDeptMemberService extends IService<SysDeptMember> {

    boolean create(SysDeptMember et);

--- a/ibzou-core/src/main/java/cn/ibizlab/core/ou/service/ISysEmployeeService.java
+++ b/ibzou-core/src/main/java/cn/ibizlab/core/ou/service/ISysEmployeeService.java
@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
 * 实体[SysEmployee] 服务对象接口
 */
+@com.baomidou.dynamic.datasource.annotation.DS("db2")
 public interface ISysEmployeeService extends IService<SysEmployee> {

    boolean create(SysEmployee et);

--- a/ibzou-core/src/main/java/cn/ibizlab/core/ou/service/ISysOrganizationService.java
+++ b/ibzou-core/src/main/java/cn/ibizlab/core/ou/service/ISysOrganizationService.java
@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
 * 实体[SysOrganization] 服务对象接口
 */
+@com.baomidou.dynamic.datasource.annotation.DS("db2")
 public interface ISysOrganizationService extends IService<SysOrganization> {

    boolean create(SysOrganization et);

--- a/ibzou-core/src/main/java/cn/ibizlab/core/ou/service/ISysPostService.java
+++ b/ibzou-core/src/main/java/cn/ibizlab/core/ou/service/ISysPostService.java
@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
 * 实体[SysPost] 服务对象接口
 */
+@com.baomidou.dynamic.datasource.annotation.DS("db2")
 public interface ISysPostService extends IService<SysPost> {

    boolean create(SysPost et);

--- a/ibzou-core/src/main/java/cn/ibizlab/core/ou/service/ISysTeamMemberService.java
+++ b/ibzou-core/src/main/java/cn/ibizlab/core/ou/service/ISysTeamMemberService.java
@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
 * 实体[SysTeamMember] 服务对象接口
 */
+@com.baomidou.dynamic.datasource.annotation.DS("db2")
 public interface ISysTeamMemberService extends IService<SysTeamMember> {

    boolean create(SysTeamMember et);

--- a/ibzou-core/src/main/java/cn/ibizlab/core/ou/service/ISysTeamService.java
+++ b/ibzou-core/src/main/java/cn/ibizlab/core/ou/service/ISysTeamService.java
@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
 * 实体[SysTeam] 服务对象接口
 */
+@com.baomidou.dynamic.datasource.annotation.DS("db2")
 public interface ISysTeamService extends IService<SysTeam> {

    boolean create(SysTeam et);

--- a/ibzou-core/src/main/resources/liquibase/h2_table.xml
+++ b/ibzou-core/src/main/resources/liquibase/h2_table.xml
@@ -4,7 +4,7 @@


    <!--输出实体[SYS_DEPT]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_dept-71-1">
+    <changeSet author="root" id="tab-sys_dept-77-1">
        <createTable tableName="IBZDEPT">
                <column name="DEPTID" remarks="" type="VARCHAR(100)">
                    <constraints primaryKey="true" primaryKeyName="PK_SYS_DEPT_DEPTID"/>
@@ -44,7 +44,7 @@


    <!--输出实体[SYS_DEPTMEMBER]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_deptmember-34-2">
+    <changeSet author="root" id="tab-sys_deptmember-34-2">
        <createTable tableName="IBZDEPTMEMBER">
                <column name="MEMBERID" remarks="" type="VARCHAR(100)">
                    <constraints primaryKey="true" primaryKeyName="PK_SYS_DEPTMEMBER_MEMBERID"/>
@@ -62,7 +62,7 @@


    <!--输出实体[SYS_EMP]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_emp-84-3">
+    <changeSet author="root" id="tab-sys_emp-84-3">
        <createTable tableName="IBZEMP">
                <column name="USERID" remarks="" type="VARCHAR(100)">
                    <constraints primaryKey="true" primaryKeyName="PK_SYS_EMP_USERID"/>
@@ -142,7 +142,7 @@


    <!--输出实体[SYS_ORG]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_org-46-4">
+    <changeSet author="root" id="tab-sys_org-47-4">
        <createTable tableName="IBZORG">
                <column name="ORGID" remarks="" type="VARCHAR(100)">
                    <constraints primaryKey="true" primaryKeyName="PK_SYS_ORG_ORGID"/>
@@ -174,7 +174,7 @@


    <!--输出实体[SYS_POST]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_post-23-5">
+    <changeSet author="root" id="tab-sys_post-23-5">
        <createTable tableName="IBZPOST">
                <column name="POSTID" remarks="" type="VARCHAR(100)">
                    <constraints primaryKey="true" primaryKeyName="PK_SYS_POST_POSTID"/>
@@ -192,7 +192,7 @@


    <!--输出实体[SYS_TEAM]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_team-23-6">
+    <changeSet author="root" id="tab-sys_team-23-6">
        <createTable tableName="IBZTEAM">
                <column name="TEAMID" remarks="" type="VARCHAR(100)">
                    <constraints primaryKey="true" primaryKeyName="PK_SYS_TEAM_TEAMID"/>
@@ -208,7 +208,7 @@


    <!--输出实体[SYS_TEAMMEMBER]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_teammember-29-7">
+    <changeSet author="root" id="tab-sys_teammember-29-7">
        <createTable tableName="IBZTEAMMEMBER">
                <column name="TEAMMEMBERID" remarks="" type="VARCHAR(100)">
                    <constraints primaryKey="true" primaryKeyName="PK_SYS_TEAMMEMBER_TEAMMEMBERID"/>
@@ -225,46 +225,46 @@
    </changeSet>

        <!--输出实体[SYS_DEPT]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-sys_dept-71-8">
+    <changeSet author="root" id="fk-sys_dept-77-8">
       <addForeignKeyConstraint baseColumnNames="PDEPTID" baseTableName="IBZDEPT" constraintName="DER1N_SYS_DEPT_SYS_DEPT_PDEPTI" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="DEPTID" referencedTableName="IBZDEPT" validate="true"/>
    </changeSet>
-    <changeSet author="a_A_5d9d78509" id="fk-sys_dept-71-9">
+    <changeSet author="root" id="fk-sys_dept-77-9">
       <addForeignKeyConstraint baseColumnNames="ORGID" baseTableName="IBZDEPT" constraintName="DER1N_SYS_DEPT_SYS_ORG_ORGID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGID" referencedTableName="IBZORG" validate="true"/>
    </changeSet>
        <!--输出实体[SYS_DEPTMEMBER]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-sys_deptmember-34-10">
+    <changeSet author="root" id="fk-sys_deptmember-34-10">
       <addForeignKeyConstraint baseColumnNames="DEPTID" baseTableName="IBZDEPTMEMBER" constraintName="DER1N_SYS_DEPTMEMBER_SYS_DEPT_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="DEPTID" referencedTableName="IBZDEPT" validate="true"/>
    </changeSet>
-    <changeSet author="a_A_5d9d78509" id="fk-sys_deptmember-34-11">
+    <changeSet author="root" id="fk-sys_deptmember-34-11">
       <addForeignKeyConstraint baseColumnNames="USERID" baseTableName="IBZDEPTMEMBER" constraintName="DER1N_SYS_DEPTMEMBER_SYS_EMP_U" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="USERID" referencedTableName="IBZEMP" validate="true"/>
    </changeSet>
-    <changeSet author="a_A_5d9d78509" id="fk-sys_deptmember-34-12">
+    <changeSet author="root" id="fk-sys_deptmember-34-12">
       <addForeignKeyConstraint baseColumnNames="POSTID" baseTableName="IBZDEPTMEMBER" constraintName="DER1N_SYS_DEPTMEMBER_SYS_POST_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="POSTID" referencedTableName="IBZPOST" validate="true"/>
    </changeSet>
        <!--输出实体[SYS_EMP]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-sys_emp-84-13">
+    <changeSet author="root" id="fk-sys_emp-84-13">
       <addForeignKeyConstraint baseColumnNames="MDEPTID" baseTableName="IBZEMP" constraintName="DER1N_SYS_EMP_SYS_DEPT_MDEPTID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="DEPTID" referencedTableName="IBZDEPT" validate="true"/>
    </changeSet>
-    <changeSet author="a_A_5d9d78509" id="fk-sys_emp-84-14">
+    <changeSet author="root" id="fk-sys_emp-84-14">
       <addForeignKeyConstraint baseColumnNames="ORGID" baseTableName="IBZEMP" constraintName="DER1N_SYS_EMP_SYS_ORG_ORGID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGID" referencedTableName="IBZORG" validate="true"/>
    </changeSet>
-    <changeSet author="a_A_5d9d78509" id="fk-sys_emp-84-15">
+    <changeSet author="root" id="fk-sys_emp-84-15">
       <addForeignKeyConstraint baseColumnNames="POSTID" baseTableName="IBZEMP" constraintName="DER1N_SYS_EMP_SYS_POST_POSTID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="POSTID" referencedTableName="IBZPOST" validate="true"/>
    </changeSet>
        <!--输出实体[SYS_ORG]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-sys_org-46-16">
+    <changeSet author="root" id="fk-sys_org-47-16">
       <addForeignKeyConstraint baseColumnNames="PORGID" baseTableName="IBZORG" constraintName="DER1N_SYS_ORG_SYS_ORG_PORGID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGID" referencedTableName="IBZORG" validate="true"/>
    </changeSet>
        <!--输出实体[SYS_POST]外键关系 -->
        <!--输出实体[SYS_TEAM]外键关系 -->
        <!--输出实体[SYS_TEAMMEMBER]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-sys_teammember-29-17">
+    <changeSet author="root" id="fk-sys_teammember-29-17">
       <addForeignKeyConstraint baseColumnNames="USERID" baseTableName="IBZTEAMMEMBER" constraintName="DER1N_SYS_TEAMMEMBER_SYS_EMP_U" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="USERID" referencedTableName="IBZEMP" validate="true"/>
    </changeSet>
-    <changeSet author="a_A_5d9d78509" id="fk-sys_teammember-29-18">
+    <changeSet author="root" id="fk-sys_teammember-29-18">
       <addForeignKeyConstraint baseColumnNames="POSTID" baseTableName="IBZTEAMMEMBER" constraintName="DER1N_SYS_TEAMMEMBER_SYS_POST_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="POSTID" referencedTableName="IBZPOST" validate="true"/>
    </changeSet>
-    <changeSet author="a_A_5d9d78509" id="fk-sys_teammember-29-19">
+    <changeSet author="root" id="fk-sys_teammember-29-19">
       <addForeignKeyConstraint baseColumnNames="TEAMID" baseTableName="IBZTEAMMEMBER" constraintName="DER1N_SYS_TEAMMEMBER_SYS_TEAM_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TEAMID" referencedTableName="IBZTEAM" validate="true"/>
    </changeSet>


--- a/ibzou-core/src/main/resources/mapper/ou/sysdepartment/SysDepartmentMapper.xml
+++ b/ibzou-core/src/main/resources/mapper/ou/sysdepartment/SysDepartmentMapper.xml
@@ -8,7 +8,7 @@
        <![CDATA[select t1.* from (SELECT t1.`BCODE`, t1.`CREATEDATE`, t1.`DEPTCODE`, t1.`DEPTID`, t1.`DEPTLEVEL`, t1.`DEPTNAME`, t1.`DOMAINS`, t1.`ENABLE`, t1.`ISVALID`, t1.`LEADERID`, t1.`LEADERNAME`, t1.`ORGID`, t11.`ORGNAME`, t1.`PDEPTID`, t21.`DEPTNAME` AS `PDEPTNAME`, t1.`SHORTNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE` FROM `IBZDEPT` t1  LEFT JOIN IBZORG t11 ON t1.ORGID = t11.ORGID  LEFT JOIN IBZDEPT t21 ON t1.PDEPTID = t21.DEPTID  ) t1 where deptid=#{id}]]>
    </select>
 	<select id="selectById"  resultMap="SysDepartmentResultMap" databaseId="oracle">
-        <![CDATA[select t1.* from (SELECT t1.BCODE, t1.CREATEDATE, t1.DEPTCODE, t1.DEPTID, t1.DEPTLEVEL, t1.DEPTNAME, t1.DOMAINS, t1.ENABLE, t1.LEADERID, t1.LEADERNAME, t1.ORGID, t11.ORGNAME, t1.PDEPTID, t21.DEPTNAME AS PDEPTNAME, t1.SHORTNAME, t1.SHOWORDER, t1.UPDATEDATE FROM IBZDEPT t1  LEFT JOIN IBZORG t11 ON t1.ORGID = t11.ORGID  LEFT JOIN IBZDEPT t21 ON t1.PDEPTID = t21.DEPTID  ) t1 where deptid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.BCODE, t1.CREATEDATE, t1.DEPTCODE, t1.DEPTID, t1.DEPTLEVEL, t1.DEPTNAME, t1.DOMAINS, t1.ENABLE, t1.ISVALID, t1.LEADERID, t1.LEADERNAME, t1.ORGID, t11.ORGNAME, t1.PDEPTID, t21.DEPTNAME AS PDEPTNAME, t1.SHORTNAME, t1.SHOWORDER, t1.UPDATEDATE FROM IBZDEPT t1  LEFT JOIN IBZORG t11 ON t1.ORGID = t11.ORGID  LEFT JOIN IBZDEPT t21 ON t1.PDEPTID = t21.DEPTID  ) t1 where deptid=#{id}]]>
    </select>
 	<select id="selectById"  resultMap="SysDepartmentResultMap" databaseId="postgresql">
        <![CDATA[select t1.* from (SELECT t1.BCODE, t1.CREATEDATE, t1.DEPTCODE, t1.DEPTID, t1.DEPTLEVEL, t1.DEPTNAME, t1.DOMAINS, t1.ENABLE, t1.LEADERID, t1.LEADERNAME, t1.ORGID, t11.ORGNAME, t1.PDEPTID, t21.DEPTNAME AS PDEPTNAME, t1.SHORTNAME, t1.SHOWORDER, t1.UPDATEDATE FROM IBZDEPT t1  LEFT JOIN IBZORG t11 ON t1.ORGID = t11.ORGID  LEFT JOIN IBZDEPT t21 ON t1.PDEPTID = t21.DEPTID  ) t1 where deptid=#{id}]]>
@@ -60,7 +60,7 @@
    </sql>
    <!--数据查询[Default]-->
    <sql id="Default" databaseId="oracle">
-		<![CDATA[ SELECT t1.BCODE, t1.CREATEDATE, t1.DEPTCODE, t1.DEPTID, t1.DEPTLEVEL, t1.DEPTNAME, t1.DOMAINS, t1.ENABLE, t1.LEADERID, t1.LEADERNAME, t1.ORGID, t11.ORGNAME, t1.PDEPTID, t21.DEPTNAME AS PDEPTNAME, t1.SHORTNAME, t1.SHOWORDER, t1.UPDATEDATE FROM IBZDEPT t1  LEFT JOIN IBZORG t11 ON t1.ORGID = t11.ORGID  LEFT JOIN IBZDEPT t21 ON t1.PDEPTID = t21.DEPTID  
+		<![CDATA[ SELECT t1.BCODE, t1.CREATEDATE, t1.DEPTCODE, t1.DEPTID, t1.DEPTLEVEL, t1.DEPTNAME, t1.DOMAINS, t1.ENABLE, t1.ISVALID, t1.LEADERID, t1.LEADERNAME, t1.ORGID, t11.ORGNAME, t1.PDEPTID, t21.DEPTNAME AS PDEPTNAME, t1.SHORTNAME, t1.SHOWORDER, t1.UPDATEDATE FROM IBZDEPT t1  LEFT JOIN IBZORG t11 ON t1.ORGID = t11.ORGID  LEFT JOIN IBZDEPT t21 ON t1.PDEPTID = t21.DEPTID  
 					 WHERE 	t1.ENABLE = 1
 			]]>
    </sql>
@@ -78,7 +78,7 @@
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="oracle">
-		<![CDATA[ SELECT t1.BCODE, t1.CREATEDATE, t1.DEPTCODE, t1.DEPTID, t1.DEPTLEVEL, t1.DEPTNAME, t1.DOMAINS, t1.ENABLE, t1.LEADERID, t1.LEADERNAME, t1.ORGID, t11.ORGNAME, t1.PDEPTID, t21.DEPTNAME AS PDEPTNAME, t1.SHORTNAME, t1.SHOWORDER, t1.UPDATEDATE FROM IBZDEPT t1  LEFT JOIN IBZORG t11 ON t1.ORGID = t11.ORGID  LEFT JOIN IBZDEPT t21 ON t1.PDEPTID = t21.DEPTID  
+		<![CDATA[ SELECT t1.BCODE, t1.CREATEDATE, t1.DEPTCODE, t1.DEPTID, t1.DEPTLEVEL, t1.DEPTNAME, t1.DOMAINS, t1.ENABLE, t1.ISVALID, t1.LEADERID, t1.LEADERNAME, t1.ORGID, t11.ORGNAME, t1.PDEPTID, t21.DEPTNAME AS PDEPTNAME, t1.SHORTNAME, t1.SHOWORDER, t1.UPDATEDATE FROM IBZDEPT t1  LEFT JOIN IBZORG t11 ON t1.ORGID = t11.ORGID  LEFT JOIN IBZDEPT t21 ON t1.PDEPTID = t21.DEPTID  
 					 WHERE 	t1.ENABLE = 1
 			]]>
    </sql>

--- a/ibzou-core/src/main/resources/mapper/ou/sysorganization/SysOrganizationMapper.xml
+++ b/ibzou-core/src/main/resources/mapper/ou/sysorganization/SysOrganizationMapper.xml
@@ -8,7 +8,7 @@
        <![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`DOMAINS`, t1.`ENABLE`, t1.`ISVALID`, t1.`ORGCODE`, t1.`ORGID`, t1.`ORGLEVEL`, t1.`ORGNAME`, t1.`PORGID`, t11.`ORGNAME` AS `PORGNAME`, t1.`SHORTNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE` FROM `IBZORG` t1  LEFT JOIN IBZORG t11 ON t1.PORGID = t11.ORGID  ) t1 where orgid=#{id}]]>
    </select>
 	<select id="selectById"  resultMap="SysOrganizationResultMap" databaseId="oracle">
-        <![CDATA[select t1.* from (SELECT t1.CREATEDATE, t1.DOMAINS, t1.ENABLE, t1.ORGCODE, t1.ORGID, t1.ORGLEVEL, t1.ORGNAME, t1.PORGID, t11.ORGNAME AS PORGNAME, t1.SHORTNAME, t1.SHOWORDER, t1.UPDATEDATE FROM IBZORG t1  LEFT JOIN IBZORG t11 ON t1.PORGID = t11.ORGID  ) t1 where orgid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.CREATEDATE, t1.DOMAINS, t1.ENABLE, t1.ISVALID, t1.ORGCODE, t1.ORGID, t1.ORGLEVEL, t1.ORGNAME, t1.PORGID, t11.ORGNAME AS PORGNAME, t1.SHORTNAME, t1.SHOWORDER, t1.UPDATEDATE FROM IBZORG t1  LEFT JOIN IBZORG t11 ON t1.PORGID = t11.ORGID  ) t1 where orgid=#{id}]]>
    </select>
 	<select id="selectById"  resultMap="SysOrganizationResultMap" databaseId="postgresql">
        <![CDATA[select t1.* from (SELECT t1.CREATEDATE, t1.DOMAINS, t1.ENABLE, t1.ORGCODE, t1.ORGID, t1.ORGLEVEL, t1.ORGNAME, t1.PORGID, t11.ORGNAME AS PORGNAME, t1.SHORTNAME, t1.SHOWORDER, t1.UPDATEDATE FROM IBZORG t1  LEFT JOIN IBZORG t11 ON t1.PORGID = t11.ORGID  ) t1 where orgid=#{id}]]>
@@ -50,7 +50,7 @@
    </sql>
    <!--数据查询[Default]-->
    <sql id="Default" databaseId="oracle">
-		<![CDATA[ SELECT t1.CREATEDATE, t1.DOMAINS, t1.ENABLE, t1.ORGCODE, t1.ORGID, t1.ORGLEVEL, t1.ORGNAME, t1.PORGID, t11.ORGNAME AS PORGNAME, t1.SHORTNAME, t1.SHOWORDER, t1.UPDATEDATE FROM IBZORG t1  LEFT JOIN IBZORG t11 ON t1.PORGID = t11.ORGID  
+		<![CDATA[ SELECT t1.CREATEDATE, t1.DOMAINS, t1.ENABLE, t1.ISVALID, t1.ORGCODE, t1.ORGID, t1.ORGLEVEL, t1.ORGNAME, t1.PORGID, t11.ORGNAME AS PORGNAME, t1.SHORTNAME, t1.SHOWORDER, t1.UPDATEDATE FROM IBZORG t1  LEFT JOIN IBZORG t11 ON t1.PORGID = t11.ORGID  
 					 WHERE 	t1.ENABLE = 1
 			]]>
    </sql>
@@ -68,7 +68,7 @@
    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="oracle">
-		<![CDATA[ SELECT t1.CREATEDATE, t1.DOMAINS, t1.ENABLE, t1.ORGCODE, t1.ORGID, t1.ORGLEVEL, t1.ORGNAME, t1.PORGID, t11.ORGNAME AS PORGNAME, t1.SHORTNAME, t1.SHOWORDER, t1.UPDATEDATE FROM IBZORG t1  LEFT JOIN IBZORG t11 ON t1.PORGID = t11.ORGID  
+		<![CDATA[ SELECT t1.CREATEDATE, t1.DOMAINS, t1.ENABLE, t1.ISVALID, t1.ORGCODE, t1.ORGID, t1.ORGLEVEL, t1.ORGNAME, t1.PORGID, t11.ORGNAME AS PORGNAME, t1.SHORTNAME, t1.SHOWORDER, t1.UPDATEDATE FROM IBZORG t1  LEFT JOIN IBZORG t11 ON t1.PORGID = t11.ORGID  
 					 WHERE 	t1.ENABLE = 1
 			]]>
    </sql>