zhouweidong@lab.ibiz5.com 发布系统代码

app_Web/src/components/app-department-select/app-department-select.vue

@@ -103,7 +103,7 @@ export default class AppDepartmentSelect extends Vue {
      * @type {*}
      * @memberof AppDepartmentSelect
      */
-    public oldurl: any[] = [];
+    public oldurl: any;
 
     /**
      * 获取节点数据
@@ -136,14 +136,14 @@ export default class AppDepartmentSelect extends Vue {
       }
       this.oldurl = _url;
       // 缓存机制
-      const result:any = this.$store.getters.getDepData(this.filter);
+      const result:any = this.$store.getters.getDepData(_url);
       if(result){
         this.Nodesdata = result;
         return;
       }
       this.$http.get(_url).then((response: any) => {
           this.Nodesdata = response.data;
-          this.$store.commit('addDepData', { srfkey: this.filter, depData: response.data });
+          this.$store.commit('addDepData', { srfkey: _url, depData: response.data });
       }).catch((response: any) => {
           if (!response || !response.status || !response.data) {
               this.$Notice.error({ title: (this.$t('app.commonWords.error') as string), desc: (this.$t('app.commonWords.sysException') as string) });

app_Web/src/components/app-group-select/app-group-select.vue

@@ -21,6 +21,7 @@
 <script lang="ts">
 import { Component, Vue, Prop, Watch } from 'vue-property-decorator';
 import { Subject } from 'rxjs';
+import CodeListService from '@/service/app/codelist-service';
 
 @Component({})
 export default class AppGroupSelect extends Vue {
@@ -64,6 +65,20 @@ export default class AppGroupSelect extends Vue {
      */  
     @Prop() data: any;
 
+    /**
+     * 代码表标识
+     * 
+     * @memberof AppGroupSelect
+     */
+    @Prop() public tag?:string;
+
+    /**
+     * 代码表类型
+     * 
+     * @memberof AppGroupSelect
+     */
+    @Prop() public codelistType?:string;
+
     /**
      * 过滤属性标识
      *
@@ -126,12 +141,12 @@ export default class AppGroupSelect extends Vue {
      * @type {*}
      * @memberof AppGroupSelect
      */  
-    @Watch('value')
-    onValueChange(newVal: any) {
+    @Watch('data',{immediate:true,deep:true})
+    onValueChange(newVal: any, oldVal: any) {
         this.selects = [];
         if (newVal) {
             let item: any = {};
-            item.label = newVal.split(',');
+            item.label = this.data[this.name]?this.data[this.name].split(','):[];
             if(this.valueitem) {
                 item.id = this.data[this.valueitem] ? this.data[this.valueitem].split(',') : [];
             }
@@ -140,13 +155,24 @@ export default class AppGroupSelect extends Vue {
                     item[this.fillmap[key]] = this.data[key] ? this.data[key].split(',') : [];
                 }
             }
-            item.label.forEach((val: string, index: number) => {
-                let _item: any = {};
-                for(let key in item) {
-                    _item[key] = item[key][index] ? item[key][index] : null;
-                }
-                this.selects.push(_item)
-            })
+            const callback:any = (item:any) =>{
+                item.label.forEach((val: string, index: number) => {
+                    let _item: any = {};
+                    for(let key in item) {
+                        _item[key] = item[key][index] ? item[key][index] : null;
+                    }
+                    this.selects.push(_item)
+                })
+            }
+            if(item.label.length == 0 && item.id.length > 0){
+                this.fillLabel(item,item.id,(result:any) =>{
+                    item.label = result.label;
+                    callback(item);
+                });
+            }else{
+                callback(item);
+            }
+            
         }
     }
 
@@ -259,7 +285,6 @@ export default class AppGroupSelect extends Vue {
                 }
             });
         } else {
-            item = this.selects.length > 0 ? this.selects[0] : {};
             item[this.name] = this.selects.length > 0 ? this.selects[0].label : null;
             if(this.valueitem) {
                 item[this.valueitem] = this.selects.length > 0 ? this.selects[0].id : null;
@@ -273,7 +298,34 @@ export default class AppGroupSelect extends Vue {
         for(let key in item) {
             this.$emit('formitemvaluechange', { name: key, value: item[key] });
         }
-    } 
+    }
+
+    /**
+     * 填充label
+     * 
+     * @memberof AppGroupSelect
+     */
+    public fillLabel(tempObject:any,valueItem:Array<any>,callback:any){
+        if(tempObject.label.length === 0 && tempObject.id.length >0 && this.tag && this.codelistType && Object.is(this.codelistType,"DYNAMIC")){
+        let codeListService:CodeListService = new CodeListService();
+        codeListService.getItems(this.tag).then((items:any) =>{
+            if(items && items.length >0 && valueItem.length >0){
+            let tempLabel:Array<any> = [];
+            valueItem.forEach((value:any) =>{
+                let result:any = items.find((item:any) =>{
+                    return item.id === value;
+                })
+                tempLabel.push(result.label);
+            })
+            Object.assign(tempObject,{label:tempLabel});
+            }
+            callback(tempObject);
+        }).catch((error:any) =>{
+            console.log(error);
+        })
+        }
+    }
+  
 }
 </script>
 

app_Web/src/components/app-upicker/app-upicker.less

-.app-picker {
+.app-upicker {
     width: 100%;
     .el-select {
         .el-input__suffix {
-            right: 20px;
+            display: none;
         }
     }
     .text-value {

app_Web/src/widgets/ibzdepartment/main-form/main-form-base.vue

@@ -100,6 +100,7 @@
   :disabled="detailsModel.leadername.disabled"
   :data="data"
   :context="context"
+  
   @formitemvaluechange="onFormItemValueChange">
 </app-group-select>
 

ibzrt-app/ibzrt-app-web/src/main/resources/application-web-prod.yml

@@ -97,7 +97,7 @@ zuul:
       stripPrefix: false
     ibzemp:
       path: /ibzemployees/**
-      serviceId: ${ibiz.ref.service.ibzrt-api:ibzrt-api}
+      serviceId: ${ibiz.ref.service.ibzou-api:ibzou-api}
       stripPrefix: false
     sys_app:
       path: /sysapps/**

ibzrt-boot/src/main/resources/application-dev.yml

@@ -20,6 +20,10 @@ zuul:
         path: /ibzdeptmembers/**
         serviceId: ${ibiz.ref.service.ibzou-api:ibzou-api}
         stripPrefix: false
+      ibzemp:
+        path: /ibzemps/**
+        serviceId: ${ibiz.ref.service.ibzou-api:ibzou-api}
+        stripPrefix: false
       ibzorg:
         path: /ibzorgs/**
         serviceId: ${ibiz.ref.service.ibzou-api:ibzou-api}

ibzrt-core/src/main/java/cn/ibizlab/core/extensions/service/IBZEmployeeExService.java

@@ -16,10 +16,6 @@ import java.util.*;
 @Service("IBZEmployeeExService")
 public class IBZEmployeeExService extends IBZEmployeeServiceImpl {
 
-    @Override
-    protected Class currentModelClass() {
-        return com.baomidou.mybatisplus.core.toolkit.ReflectionKit.getSuperClassGenericType(this.getClass().getSuperclass(), 1);
-    }
 
     /**
      * 自定义行为[InitPwd]用户扩展

ibzrt-core/src/main/java/cn/ibizlab/core/ou/domain/IBZEmployee.java

@@ -23,312 +23,300 @@ import lombok.*;
 import org.springframework.data.annotation.Transient;
 import cn.ibizlab.util.annotation.Audit;
 
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.baomidou.mybatisplus.annotation.*;
-import cn.ibizlab.util.domain.EntityMP;
+import cn.ibizlab.util.domain.EntityClient;
 
 /**
- * 实体[人员]
+ * ServiceApi [人员] 对象
  */
-@Getter
-@Setter
-@NoArgsConstructor
-@JsonIgnoreProperties(value = "handler")
-@TableName(value = "IBZEMP",resultMap = "IBZEmployeeResultMap")
-public class IBZEmployee extends EntityMP implements Serializable {
-
-    private static final long serialVersionUID = 1L;
+@Data
+public class IBZEmployee extends EntityClient implements Serializable {
 
     /**
      * 用户标识
      */
     @DEField(isKeyField=true)
-    @TableId(value= "userid",type=IdType.ASSIGN_UUID)
     @JSONField(name = "userid")
     @JsonProperty("userid")
     private String userid;
+
     /**
      * 用户全局名
      */
-    @TableField(value = "username")
     @JSONField(name = "username")
     @JsonProperty("username")
     private String username;
+
     /**
      * 姓名
      */
-    @TableField(value = "personname")
     @JSONField(name = "personname")
     @JsonProperty("personname")
     private String personname;
+
     /**
      * 用户工号
      */
-    @TableField(value = "usercode")
     @JSONField(name = "usercode")
     @JsonProperty("usercode")
     private String usercode;
+
     /**
      * 登录名
      */
-    @TableField(value = "loginname")
     @JSONField(name = "loginname")
     @JsonProperty("loginname")
     private String loginname;
+
     /**
      * 密码
      */
-    @TableField(value = "password")
     @JSONField(name = "password")
     @JsonProperty("password")
     private String password;
+
     /**
      * 区属
      */
-    @TableField(value = "domains")
     @JSONField(name = "domains")
     @JsonProperty("domains")
     private String domains;
+
     /**
      * 主部门
      */
-    @TableField(value = "mdeptid")
     @JSONField(name = "mdeptid")
     @JsonProperty("mdeptid")
     private String mdeptid;
+
     /**
      * 主部门代码
      */
-    @TableField(value = "mdeptcode")
     @JSONField(name = "mdeptcode")
     @JsonProperty("mdeptcode")
     private String mdeptcode;
+
     /**
      * 主部门名称
      */
-    @TableField(value = "mdeptname")
     @JSONField(name = "mdeptname")
     @JsonProperty("mdeptname")
     private String mdeptname;
+
     /**
      * 业务编码
      */
-    @TableField(value = "bcode")
     @JSONField(name = "bcode")
     @JsonProperty("bcode")
     private String bcode;
+
     /**
      * 岗位标识
      */
-    @TableField(value = "postid")
     @JSONField(name = "postid")
     @JsonProperty("postid")
     private String postid;
+
     /**
      * 岗位代码
      */
-    @TableField(value = "postcode")
     @JSONField(name = "postcode")
     @JsonProperty("postcode")
     private String postcode;
+
     /**
      * 岗位名称
      */
-    @TableField(value = "postname")
     @JSONField(name = "postname")
     @JsonProperty("postname")
     private String postname;
+
     /**
      * 单位
      */
     @DEField(preType = DEPredefinedFieldType.ORGID)
-    @TableField(value = "orgid")
     @JSONField(name = "orgid")
     @JsonProperty("orgid")
     private String orgid;
+
     /**
      * 单位代码
      */
-    @TableField(value = "orgcode")
     @JSONField(name = "orgcode")
     @JsonProperty("orgcode")
     private String orgcode;
+
     /**
      * 单位名称
      */
     @DEField(preType = DEPredefinedFieldType.ORGNAME)
-    @TableField(value = "orgname")
     @JSONField(name = "orgname")
     @JsonProperty("orgname")
     private String orgname;
+
     /**
      * 昵称别名
      */
-    @TableField(value = "nickname")
     @JSONField(name = "nickname")
     @JsonProperty("nickname")
     private String nickname;
+
     /**
      * 性别
      */
-    @TableField(value = "sex")
     @JSONField(name = "sex")
     @JsonProperty("sex")
     private String sex;
+
     /**
      * 证件号码
      */
-    @TableField(value = "certcode")
     @JSONField(name = "certcode")
     @JsonProperty("certcode")
     private String certcode;
+
     /**
      * 联系方式
      */
-    @TableField(value = "phone")
     @JSONField(name = "phone")
     @JsonProperty("phone")
     private String phone;
+
     /**
      * 出生日期
      */
-    @TableField(value = "birthday")
     @JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8")
     @JSONField(name = "birthday" , format="yyyy-MM-dd")
     @JsonProperty("birthday")
     private Timestamp birthday;
+
     /**
      * 邮件
      */
-    @TableField(value = "email")
     @JSONField(name = "email")
     @JsonProperty("email")
     private String email;
+
     /**
      * 社交账号
      */
-    @TableField(value = "avatar")
     @JSONField(name = "avatar")
     @JsonProperty("avatar")
     private String avatar;
+
     /**
      * 地址
      */
-    @TableField(value = "addr")
     @JSONField(name = "addr")
     @JsonProperty("addr")
     private String addr;
+
     /**
      * 照片
      */
-    @TableField(value = "usericon")
     @JSONField(name = "usericon")
     @JsonProperty("usericon")
     private String usericon;
+
     /**
      * ip地址
      */
-    @TableField(value = "ipaddr")
     @JSONField(name = "ipaddr")
     @JsonProperty("ipaddr")
     private String ipaddr;
+
     /**
      * 样式
      */
-    @TableField(value = "theme")
     @JSONField(name = "theme")
     @JsonProperty("theme")
     private String theme;
+
     /**
      * 语言
      */
-    @TableField(value = "lang")
     @JSONField(name = "lang")
     @JsonProperty("lang")
     private String lang;
+
     /**
      * 字号
      */
-    @TableField(value = "fontsize")
     @JSONField(name = "fontsize")
     @JsonProperty("fontsize")
     private String fontsize;
+
     /**
      * 备注
      */
-    @TableField(value = "memo")
     @JSONField(name = "memo")
     @JsonProperty("memo")
     private String memo;
+
     /**
      * 保留
      */
-    @TableField(value = "reserver")
     @JSONField(name = "reserver")
     @JsonProperty("reserver")
     private String reserver;
+
     /**
      * 排序
      */
-    @TableField(value = "showorder")
     @JSONField(name = "showorder")
     @JsonProperty("showorder")
     private Integer showorder;
+
     /**
      * 逻辑有效
      */
     @DEField(preType = DEPredefinedFieldType.LOGICVALID, logicval = "1" , logicdelval="0")
-    @TableLogic(value= "1",delval="0")
-    @TableField(value = "enable")
     @JSONField(name = "enable")
     @JsonProperty("enable")
     private Integer enable;
+
     /**
      * 创建时间
      */
     @DEField(preType = DEPredefinedFieldType.CREATEDATE)
-    @TableField(value = "createdate" , fill = FieldFill.INSERT)
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
     @JSONField(name = "createdate" , format="yyyy-MM-dd HH:mm:ss")
     @JsonProperty("createdate")
     private Timestamp createdate;
+
     /**
      * 最后修改时间
      */
     @DEField(preType = DEPredefinedFieldType.UPDATEDATE)
-    @TableField(value = "updatedate")
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
     @JSONField(name = "updatedate" , format="yyyy-MM-dd HH:mm:ss")
     @JsonProperty("updatedate")
     private Timestamp updatedate;
 
+
     /**
      * 
      */
-    @JsonIgnore
-    @JSONField(serialize = false)
-    @TableField(exist = false)
+    @JSONField(name = "maindept")
+    @JsonProperty("maindept")
     private cn.ibizlab.core.ou.domain.IBZDepartment maindept;
 
     /**
      * 
      */
-    @JsonIgnore
-    @JSONField(serialize = false)
-    @TableField(exist = false)
+    @JSONField(name = "org")
+    @JsonProperty("org")
     private cn.ibizlab.core.ou.domain.IBZOrganization org;
 
     /**
      * 
      */
-    @JsonIgnore
-    @JSONField(serialize = false)
-    @TableField(exist = false)
+    @JSONField(name = "post")
+    @JsonProperty("post")
     private cn.ibizlab.core.ou.domain.IBZPost post;
 
 
 
+
     /**
      * 设置 [用户全局名]
      */

ibzrt-core/src/main/java/cn/ibizlab/core/ou/filter/IBZEmployeeSearchContext.java

@@ -17,107 +17,36 @@ import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
 
-import cn.ibizlab.util.filter.QueryWrapperContext;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import cn.ibizlab.core.ou.domain.IBZEmployee;
+import cn.ibizlab.util.filter.SearchContextBase;
+
 /**
- * 关系型数据实体[IBZEmployee] 查询条件对象
+ * ServiceApi数据实体[IBZEmployee] 查询条件对象
  */
 @Slf4j
 @Data
-public class IBZEmployeeSearchContext extends QueryWrapperContext<IBZEmployee> {
-
+public class IBZEmployeeSearchContext extends SearchContextBase {
 	private String n_personname_like;//[姓名]
-	public void setN_personname_like(String n_personname_like) {
-        this.n_personname_like = n_personname_like;
-        if(!ObjectUtils.isEmpty(this.n_personname_like)){
-            this.getSearchCond().like("personname", n_personname_like);
-        }
-    }
+
 	private String n_usercode_like;//[用户工号]
-	public void setN_usercode_like(String n_usercode_like) {
-        this.n_usercode_like = n_usercode_like;
-        if(!ObjectUtils.isEmpty(this.n_usercode_like)){
-            this.getSearchCond().like("usercode", n_usercode_like);
-        }
-    }
+
 	private String n_mdeptid_eq;//[主部门]
-	public void setN_mdeptid_eq(String n_mdeptid_eq) {
-        this.n_mdeptid_eq = n_mdeptid_eq;
-        if(!ObjectUtils.isEmpty(this.n_mdeptid_eq)){
-            this.getSearchCond().eq("mdeptid", n_mdeptid_eq);
-        }
-    }
+
 	private String n_mdeptname_like;//[主部门名称]
-	public void setN_mdeptname_like(String n_mdeptname_like) {
-        this.n_mdeptname_like = n_mdeptname_like;
-        if(!ObjectUtils.isEmpty(this.n_mdeptname_like)){
-            this.getSearchCond().like("mdeptname", n_mdeptname_like);
-        }
-    }
+
 	private String n_bcode_like;//[业务编码]
-	public void setN_bcode_like(String n_bcode_like) {
-        this.n_bcode_like = n_bcode_like;
-        if(!ObjectUtils.isEmpty(this.n_bcode_like)){
-            this.getSearchCond().like("bcode", n_bcode_like);
-        }
-    }
+
 	private String n_postid_eq;//[岗位标识]
-	public void setN_postid_eq(String n_postid_eq) {
-        this.n_postid_eq = n_postid_eq;
-        if(!ObjectUtils.isEmpty(this.n_postid_eq)){
-            this.getSearchCond().eq("postid", n_postid_eq);
-        }
-    }
+
 	private String n_postname_eq;//[岗位名称]
-	public void setN_postname_eq(String n_postname_eq) {
-        this.n_postname_eq = n_postname_eq;
-        if(!ObjectUtils.isEmpty(this.n_postname_eq)){
-            this.getSearchCond().eq("postname", n_postname_eq);
-        }
-    }
+
 	private String n_postname_like;//[岗位名称]
-	public void setN_postname_like(String n_postname_like) {
-        this.n_postname_like = n_postname_like;
-        if(!ObjectUtils.isEmpty(this.n_postname_like)){
-            this.getSearchCond().like("postname", n_postname_like);
-        }
-    }
+
 	private String n_orgid_eq;//[单位]
-	public void setN_orgid_eq(String n_orgid_eq) {
-        this.n_orgid_eq = n_orgid_eq;
-        if(!ObjectUtils.isEmpty(this.n_orgid_eq)){
-            this.getSearchCond().eq("orgid", n_orgid_eq);
-        }
-    }
+
 	private String n_orgcode_leftlike;//[单位代码]
-	public void setN_orgcode_leftlike(String n_orgcode_leftlike) {
-        this.n_orgcode_leftlike = n_orgcode_leftlike;
-        if(!ObjectUtils.isEmpty(this.n_orgcode_leftlike)){
-            this.getSearchCond().likeRight("orgcode", n_orgcode_leftlike);
-        }
-    }
+
 	private String n_sex_eq;//[性别]
-	public void setN_sex_eq(String n_sex_eq) {
-        this.n_sex_eq = n_sex_eq;
-        if(!ObjectUtils.isEmpty(this.n_sex_eq)){
-            this.getSearchCond().eq("sex", n_sex_eq);
-        }
-    }
-
-    /**
-	 * 启用快速搜索
-	 */
-	public void setQuery(String query)
-	{
-		 this.query=query;
-		 if(!StringUtils.isEmpty(query)){
-            this.getSearchCond().and( wrapper ->
-                     wrapper.like("personname", query)   
-            );
-		 }
-	}
-}
 
+}
 
 

ibzrt-core/src/main/java/cn/ibizlab/core/ou/service/IIBZEmployeeService.java

@@ -18,12 +18,10 @@ import cn.ibizlab.core.ou.domain.IBZEmployee;
 import cn.ibizlab.core.ou.filter.IBZEmployeeSearchContext;
 
 
-import com.baomidou.mybatisplus.extension.service.IService;
-
 /**
  * 实体[IBZEmployee] 服务对象接口
  */
-public interface IIBZEmployeeService extends IService<IBZEmployee>{
+public interface IIBZEmployeeService{
 
     boolean create(IBZEmployee et) ;
     @CacheEvict(value="ibzemployee",allEntries=true)
@@ -51,23 +49,8 @@ public interface IIBZEmployeeService extends IService<IBZEmployee>{
     List<IBZEmployee> selectByPostid(String postid) ;
     @CacheEvict(value="ibzemployee",allEntries=true)
     void removeByPostid(String postid) ;
-    /**
-     *自定义查询SQL
-     * @param sql  select * from table where id =#{et.param}
-     * @param param 参数列表  param.put("param","1");
-     * @return select * from table where id = '1'
-     */
-    List<JSONObject> select(String sql, Map param);
-    /**
-     *自定义SQL
-     * @param sql  update table  set name ='test' where id =#{et.param}
-     * @param param 参数列表  param.put("param","1");
-     * @return     update table  set name ='test' where id = '1'
-     */
-    boolean execute(String sql, Map param);
 
-    List<IBZEmployee> getIbzemployeeByIds(List<String> ids) ;
-    List<IBZEmployee> getIbzemployeeByEntities(List<IBZEmployee> entities) ;
 }
 
 
+

ibzrt-core/src/main/java/cn/ibizlab/core/ou/service/impl/IBZDepartmentServiceImpl.java

@@ -43,9 +43,6 @@ public class IBZDepartmentServiceImpl implements IIBZDepartmentService {
     @Autowired
     IBZDepartmentFeignClient iBZDepartmentFeignClient;
 
-    @Autowired
-    @Lazy
-    protected cn.ibizlab.core.ou.service.IIBZEmployeeService ibzemployeeService;
 
     @Override
     public boolean create(IBZDepartment et) {

ibzrt-core/src/main/java/cn/ibizlab/core/ou/service/impl/IBZOrganizationServiceImpl.java

@@ -43,9 +43,6 @@ public class IBZOrganizationServiceImpl implements IIBZOrganizationService {
     @Autowired
     IBZOrganizationFeignClient iBZOrganizationFeignClient;
 
-    @Autowired
-    @Lazy
-    protected cn.ibizlab.core.ou.service.IIBZEmployeeService ibzemployeeService;
 
     @Override
     public boolean create(IBZOrganization et) {

ibzrt-core/src/main/java/cn/ibizlab/core/ou/service/impl/IBZPostServiceImpl.java

@@ -43,9 +43,6 @@ public class IBZPostServiceImpl implements IIBZPostService {
     @Autowired
     IBZPostFeignClient iBZPostFeignClient;
 
-    @Autowired
-    @Lazy
-    protected cn.ibizlab.core.ou.service.IIBZEmployeeService ibzemployeeService;
 
     @Override
     public boolean create(IBZPost et) {

ibzrt-core/src/main/resources/liquibase/h2_table.xml

@@ -11,84 +11,6 @@
 
 
 
-    <!--输出实体[IBZEMP]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-ibzemp-2-1">
-        <createTable tableName="IBZEMP">
-                <column name="USERID" remarks="" type="VARCHAR(100)">
-                    <constraints primaryKey="true" primaryKeyName="PK_IBZEMP_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>
 
 
 
@@ -144,15 +66,5 @@
 
 
 
-        <!--输出实体[IBZEMP]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-ibzemp-2-2">
-       <addForeignKeyConstraint baseColumnNames="MDEPTID" baseTableName="IBZEMP" constraintName="DER1N_IBZEMP_IBZDEPT_MDEPTID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="DEPTID" referencedTableName="IBZDEPT" validate="true"/>
-    </changeSet>
-    <changeSet author="a_A_5d9d78509" id="fk-ibzemp-2-3">
-       <addForeignKeyConstraint baseColumnNames="ORGID" baseTableName="IBZEMP" constraintName="DER1N_IBZEMP_IBZORG_ORGID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGID" referencedTableName="IBZORG" validate="true"/>
-    </changeSet>
-    <changeSet author="a_A_5d9d78509" id="fk-ibzemp-2-4">
-       <addForeignKeyConstraint baseColumnNames="POSTID" baseTableName="IBZEMP" constraintName="DER1N_IBZEMP_IBZPOST_POSTID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="POSTID" referencedTableName="IBZPOST" validate="true"/>
-    </changeSet>
 
 </databaseChangeLog>