diff --git a/ibzou-core/src/main/java/cn/ibizlab/core/ou/filter/SysEmployeeSearchContext.java b/ibzou-core/src/main/java/cn/ibizlab/core/ou/filter/SysEmployeeSearchContext.java index 1977dba39216c661ed9420528d87a7e29920341a..7e494e378ab53fc7f7a6919ea3ed9b4e1f309e09 100644 --- a/ibzou-core/src/main/java/cn/ibizlab/core/ou/filter/SysEmployeeSearchContext.java +++ b/ibzou-core/src/main/java/cn/ibizlab/core/ou/filter/SysEmployeeSearchContext.java @@ -27,6 +27,20 @@ import cn.ibizlab.core.ou.domain.SysEmployee; @Data public class SysEmployeeSearchContext extends QueryWrapperContext<SysEmployee> { + private String n_username_in;//[鐢ㄦ埛鍏ㄥ眬鍚峕 + public void setN_username_in(String n_username_in) { + this.n_username_in = n_username_in; + if(!ObjectUtils.isEmpty(this.n_username_in)){ + this.getSearchCond().in("username",this.n_username_in.split(";")); + } + } + private String n_username_notin;//[鐢ㄦ埛鍏ㄥ眬鍚峕 + public void setN_username_notin(String n_username_notin) { + this.n_username_notin = n_username_notin; + if(!ObjectUtils.isEmpty(this.n_username_notin)){ + this.getSearchCond().notIn("username",this.n_username_notin.split(";")); + } + } private String n_personname_like;//[濮撳悕] public void setN_personname_like(String n_personname_like) { this.n_personname_like = n_personname_like; diff --git a/ibzou-core/src/main/resources/liquibase/h2_table.xml b/ibzou-core/src/main/resources/liquibase/h2_table.xml index f5d199f468125144f51b6ba120f1983c0d0a5765..32c4a83890794d845f610435a0ee3a8636f548d6 100644 --- a/ibzou-core/src/main/resources/liquibase/h2_table.xml +++ b/ibzou-core/src/main/resources/liquibase/h2_table.xml @@ -1,267 +1,8 @@ -<?xml version="1.1" encoding="UTF-8" standalone="no"?> -<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd"> - - - - <!--杈撳嚭瀹炰綋[SYS_DEPT]鏁版嵁缁撴瀯 --> - <changeSet author="a_A_5d9d78509" id="tab-sys_dept-58-1"> - <createTable tableName="IBZDEPT"> - <column name="DEPTID" remarks="" type="VARCHAR(100)"> - <constraints primaryKey="true" primaryKeyName="PK_SYS_DEPT_DEPTID"/> - </column> - <column name="DEPTCODE" remarks="" type="VARCHAR(100)"> - </column> - <column name="DEPTNAME" remarks="" type="VARCHAR(100)"> - </column> - <column name="ORGID" remarks="" type="VARCHAR(100)"> - </column> - <column name="PDEPTID" remarks="" type="VARCHAR(100)"> - </column> - <column name="SHORTNAME" remarks="" type="VARCHAR(100)"> - </column> - <column name="DEPTLEVEL" remarks="" type="INT"> - </column> - <column name="DOMAINS" remarks="" type="VARCHAR(100)"> - </column> - <column name="SHOWORDER" remarks="" type="INT"> - </column> - <column name="BCODE" remarks="" type="VARCHAR(100)"> - </column> - <column name="LEADERID" remarks="" type="VARCHAR(100)"> - </column> - <column name="LEADERNAME" remarks="" type="VARCHAR(100)"> - </column> - <column name="ENABLE" remarks="" type="INT"> - </column> - <column name="CREATEDATE" remarks="" type="DATETIME"> - </column> - <column name="UPDATEDATE" remarks="" type="DATETIME"> - </column> - </createTable> - </changeSet> - - - <!--杈撳嚭瀹炰綋[SYS_DEPTMEMBER]鏁版嵁缁撴瀯 --> - <changeSet author="a_A_5d9d78509" id="tab-sys_deptmember-27-2"> - <createTable tableName="IBZDEPTMEMBER"> - <column name="MEMBERID" remarks="" type="VARCHAR(100)"> - <constraints primaryKey="true" primaryKeyName="PK_SYS_DEPTMEMBER_MEMBERID"/> - </column> - <column name="DEPTID" remarks="" type="VARCHAR(100)"> - </column> - <column name="USERID" remarks="" type="VARCHAR(100)"> - </column> - <column name="POSTID" remarks="" type="VARCHAR(100)"> - </column> - <column name="DOMAINS" remarks="" type="VARCHAR(100)"> - </column> - </createTable> - </changeSet> - - - <!--杈撳嚭瀹炰綋[SYS_EMP]鏁版嵁缁撴瀯 --> - <changeSet author="a_A_5d9d78509" id="tab-sys_emp-72-3"> - <createTable tableName="IBZEMP"> - <column name="USERID" remarks="" type="VARCHAR(100)"> - <constraints primaryKey="true" primaryKeyName="PK_SYS_EMP_USERID"/> - </column> - <column name="USERNAME" remarks="" type="VARCHAR(100)"> - </column> - <column name="PERSONNAME" remarks="" type="VARCHAR(100)"> - </column> - <column name="USERCODE" remarks="" type="VARCHAR(100)"> - </column> - <column name="LOGINNAME" remarks="" type="VARCHAR(100)"> - </column> - <column name="PASSWORD" remarks="" type="VARCHAR(100)"> - </column> - <column name="DOMAINS" remarks="" type="VARCHAR(100)"> - </column> - <column name="MDEPTID" remarks="" type="VARCHAR(100)"> - </column> - <column name="MDEPTCODE" remarks="" type="VARCHAR(100)"> - </column> - <column name="MDEPTNAME" remarks="" type="VARCHAR(100)"> - </column> - <column name="BCODE" remarks="" type="VARCHAR(100)"> - </column> - <column name="POSTID" remarks="" type="VARCHAR(100)"> - </column> - <column name="POSTCODE" remarks="" type="VARCHAR(100)"> - </column> - <column name="POSTNAME" remarks="" type="VARCHAR(100)"> - </column> - <column name="ORGID" remarks="" type="VARCHAR(100)"> - </column> - <column name="ORGCODE" remarks="" type="VARCHAR(100)"> - </column> - <column name="ORGNAME" remarks="" type="VARCHAR(100)"> - </column> - <column name="NICKNAME" remarks="" type="VARCHAR(100)"> - </column> - <column name="SEX" remarks="" type="VARCHAR(20)"> - </column> - <column name="CERTCODE" remarks="" type="VARCHAR(100)"> - </column> - <column name="PHONE" remarks="" type="VARCHAR(100)"> - </column> - <column name="BIRTHDAY" remarks="" type="DATETIME"> - </column> - <column name="EMAIL" remarks="" type="VARCHAR(100)"> - </column> - <column name="AVATAR" remarks="" type="VARCHAR(100)"> - </column> - <column name="ADDR" remarks="" type="VARCHAR(255)"> - </column> - <column name="USERICON" remarks="" type="VARCHAR(255)"> - </column> - <column name="IPADDR" remarks="" type="VARCHAR(100)"> - </column> - <column name="THEME" remarks="" type="VARCHAR(100)"> - </column> - <column name="LANG" remarks="" type="VARCHAR(100)"> - </column> - <column name="FONTSIZE" remarks="" type="VARCHAR(10)"> - </column> - <column name="MEMO" remarks="" type="VARCHAR(255)"> - </column> - <column name="RESERVER" remarks="" type="VARCHAR(255)"> - </column> - <column name="SHOWORDER" remarks="" type="INT"> - </column> - <column name="ENABLE" remarks="" type="INT"> - </column> - <column name="CREATEDATE" remarks="" type="DATETIME"> - </column> - <column name="UPDATEDATE" remarks="" type="DATETIME"> - </column> - </createTable> - </changeSet> - - - <!--杈撳嚭瀹炰綋[SYS_ORG]鏁版嵁缁撴瀯 --> - <changeSet author="a_A_5d9d78509" id="tab-sys_org-33-4"> - <createTable tableName="IBZORG"> - <column name="ORGID" remarks="" type="VARCHAR(100)"> - <constraints primaryKey="true" primaryKeyName="PK_SYS_ORG_ORGID"/> - </column> - <column name="ORGCODE" remarks="" type="VARCHAR(100)"> - </column> - <column name="ORGNAME" remarks="" type="VARCHAR(100)"> - </column> - <column name="PORGID" remarks="" type="VARCHAR(100)"> - </column> - <column name="SHORTNAME" remarks="" type="VARCHAR(100)"> - </column> - <column name="ORGLEVEL" remarks="" type="INT"> - </column> - <column name="SHOWORDER" remarks="" type="INT"> - </column> - <column name="DOMAINS" remarks="" type="VARCHAR(100)"> - </column> - <column name="ENABLE" remarks="" type="INT"> - </column> - <column name="CREATEDATE" remarks="" type="DATETIME"> - </column> - <column name="UPDATEDATE" remarks="" type="DATETIME"> - </column> - </createTable> - </changeSet> - - - <!--杈撳嚭瀹炰綋[SYS_POST]鏁版嵁缁撴瀯 --> - <changeSet author="a_A_5d9d78509" id="tab-sys_post-21-5"> - <createTable tableName="IBZPOST"> - <column name="POSTID" remarks="" type="VARCHAR(100)"> - <constraints primaryKey="true" primaryKeyName="PK_SYS_POST_POSTID"/> - </column> - <column name="POSTCODE" remarks="" type="VARCHAR(100)"> - </column> - <column name="POSTNAME" remarks="" type="VARCHAR(100)"> - </column> - <column name="DOMAINS" remarks="" type="VARCHAR(100)"> - </column> - <column name="MEMO" remarks="" type="VARCHAR(2000)"> - </column> - </createTable> - </changeSet> - - - <!--杈撳嚭瀹炰綋[SYS_TEAM]鏁版嵁缁撴瀯 --> - <changeSet author="a_A_5d9d78509" id="tab-sys_team-21-6"> - <createTable tableName="IBZTEAM"> - <column name="TEAMID" remarks="" type="VARCHAR(100)"> - <constraints primaryKey="true" primaryKeyName="PK_SYS_TEAM_TEAMID"/> - </column> - <column name="TEAMNAME" remarks="" type="VARCHAR(100)"> - </column> - <column name="MEMO" remarks="" type="VARCHAR(2000)"> - </column> - <column name="DOMAINS" remarks="" type="VARCHAR(100)"> - </column> - </createTable> - </changeSet> - - - <!--杈撳嚭瀹炰綋[SYS_TEAMMEMBER]鏁版嵁缁撴瀯 --> - <changeSet author="a_A_5d9d78509" id="tab-sys_teammember-24-7"> - <createTable tableName="IBZTEAMMEMBER"> - <column name="TEAMMEMBERID" remarks="" type="VARCHAR(100)"> - <constraints primaryKey="true" primaryKeyName="PK_SYS_TEAMMEMBER_TEAMMEMBERID"/> - </column> - <column name="TEAMID" remarks="" type="VARCHAR(100)"> - </column> - <column name="USERID" remarks="" type="VARCHAR(100)"> - </column> - <column name="POSTID" remarks="" type="VARCHAR(100)"> - </column> - <column name="DOMAINS" remarks="" type="VARCHAR(100)"> - </column> - </createTable> - </changeSet> - - <!--杈撳嚭瀹炰綋[SYS_DEPT]澶栭敭鍏崇郴 --> - <changeSet author="a_A_5d9d78509" id="fk-sys_dept-58-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-58-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-27-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-27-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-27-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-72-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-72-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-72-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-33-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-24-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-24-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-24-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> - -</databaseChangeLog> +!!!!妯$増浜х敓浠g爜閿欒:---- +Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)?? +---- + +---- +FTL stack trace ("~" means nesting-related): + - Failed at: ${dbinst.getUserName()} [in template "CODETEMPL_en_US" at line 28, column 24] +---- \ No newline at end of file