Merge remote-tracking branch 'origin/master'

app_web/src/locale/lanres/ibzdepartment/ibzdepartment_en_US.ts

@@ -10,6 +10,8 @@ export default {
     deptlevel: '部门级别',
     showorder: '排序',
     bcode: '业务编码',
+    leaderid: '分管领导标识',
+    leadername: '分管领导',
     enable: '逻辑有效',
     orgname: '单位',
     parentdeptname: '上级部门',
@@ -83,6 +85,8 @@ export default {
 			shortname: "部门简称", 
 			bcode: "业务编码", 
 			deptlevel: "部门级别", 
+			leaderid: "分管领导标识", 
+			leadername: "分管领导", 
 			showorder: "排序", 
 			createdate: "创建时间", 
 			updatedate: "最后修改时间", 

app_web/src/locale/lanres/ibzdepartment/ibzdepartment_zh_CN.ts

@@ -9,6 +9,8 @@ export default {
     deptlevel: '部门级别',
     showorder: '排序',
     bcode: '业务编码',
+    leaderid: '分管领导标识',
+    leadername: '分管领导',
     enable: '逻辑有效',
     orgname: '单位',
     parentdeptname: '上级部门',
@@ -82,6 +84,8 @@ export default {
 			shortname: '部门简称', 
 			bcode: '业务编码', 
 			deptlevel: '部门级别', 
+			leaderid: '分管领导标识', 
+			leadername: '分管领导', 
 			showorder: '排序', 
 			createdate: '创建时间', 
 			updatedate: '最后修改时间', 

app_web/src/pages/ou/ibzdepartment-grid-view/ibzdepartment-grid-view-base.vue

 <template>
-    <div class='view-container degridview ibzdepartment-grid-view'>
+<div class='view-container degridview ibzdepartment-grid-view'>
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="ibzdepartmentgridview"></app-studioaction>
     <card class='view-card '  :dis-hover="true" :bordered="false">
         <p slot='title'>
@@ -9,7 +9,7 @@
             <div class='view-top-messages'>
             </div>
             <div style='margin-bottom: 6px;'>
-                <i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' />
+                <i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' placeholder="请输入部门名称" />
                 <div class='pull-right'>
                     <div class='toolbar-container'>
                         <tooltip :transfer="true" :max-width="600">

app_web/src/pages/ou/ibzemployee-grid-view/ibzemployee-grid-view-base.vue

 <template>
-    <div class='view-container degridview ibzemployee-grid-view'>
+<div class='view-container degridview ibzemployee-grid-view'>
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="ibzemployeegridview"></app-studioaction>
     <card class='view-card '  :dis-hover="true" :bordered="false">
         <p slot='title'>
@@ -9,7 +9,7 @@
             <div class='view-top-messages'>
             </div>
             <div style='margin-bottom: 6px;'>
-                <i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' />
+                <i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' placeholder="请输入姓名" />
                 <div class='pull-right'>
                     <div class='toolbar-container'>
                         <tooltip :transfer="true" :max-width="600">

app_web/src/pages/ou/ibzorganization-grid-view/ibzorganization-grid-view-base.vue

 <template>
-    <div class='view-container degridview ibzorganization-grid-view'>
+<div class='view-container degridview ibzorganization-grid-view'>
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="ibzorganizationgridview"></app-studioaction>
     <card class='view-card '  :dis-hover="true" :bordered="false">
         <p slot='title'>
@@ -9,7 +9,7 @@
             <div class='view-top-messages'>
             </div>
             <div style='margin-bottom: 6px;'>
-                <i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' />
+                <i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' placeholder="请输入名称" />
                 <div class='pull-right'>
                     <div class='toolbar-container'>
                         <tooltip :transfer="true" :max-width="600">

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

@@ -82,6 +82,12 @@
     <input-box v-model="data.deptlevel"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.deptlevel.disabled" type='number'  style=""></input-box>
 </app-form-item>
 
+</i-col>
+<i-col v-show="detailsModel.leadername.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='leadername' :itemRules="this.rules.leadername" class='' :caption="$t('entities.ibzdepartment.main_form.details.leadername')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.leadername.error" :isEmptyCaption="false" labelPos="LEFT">
+    <input-box v-model="data.leadername"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.leadername.disabled" type='text'  style=""></input-box>
+</app-form-item>
+
 </i-col>
 <i-col v-show="detailsModel.showorder.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='showorder' :itemRules="this.rules.showorder" class='' :caption="$t('entities.ibzdepartment.main_form.details.showorder')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.showorder.error" :isEmptyCaption="false" labelPos="LEFT">
@@ -413,6 +419,8 @@ export default class MainBase extends Vue implements ControlInterface {
         shortname: null,
         bcode: null,
         deptlevel: null,
+        leaderid: null,
+        leadername: null,
         showorder: null,
         createdate: null,
         updatedate: null,
@@ -566,6 +574,18 @@ export default class MainBase extends Vue implements ControlInterface {
             { required: false, type: 'number', message: '部门级别 值不能为空', trigger: 'change' },
             { required: false, type: 'number', message: '部门级别 值不能为空', trigger: 'blur' },
         ],
+        leaderid: [
+            { type: 'string', message: '分管领导标识 值必须为字符串类型', trigger: 'change' },
+            { type: 'string', message: '分管领导标识 值必须为字符串类型', trigger: 'blur' },
+            { required: false, type: 'string', message: '分管领导标识 值不能为空', trigger: 'change' },
+            { required: false, type: 'string', message: '分管领导标识 值不能为空', trigger: 'blur' },
+        ],
+        leadername: [
+            { type: 'string', message: '分管领导 值必须为字符串类型', trigger: 'change' },
+            { type: 'string', message: '分管领导 值必须为字符串类型', trigger: 'blur' },
+            { required: false, type: 'string', message: '分管领导 值不能为空', trigger: 'change' },
+            { required: false, type: 'string', message: '分管领导 值不能为空', trigger: 'blur' },
+        ],
         showorder: [
             { type: 'number', message: '排序 值必须为数值类型', trigger: 'change' },
             { type: 'number', message: '排序 值必须为数值类型', trigger: 'blur' },
@@ -630,6 +650,10 @@ export default class MainBase extends Vue implements ControlInterface {
         bcode: new FormItemModel({ caption: '业务编码', detailType: 'FORMITEM', name: 'bcode', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
         deptlevel: new FormItemModel({ caption: '部门级别', detailType: 'FORMITEM', name: 'deptlevel', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
+, 
+        leaderid: new FormItemModel({ caption: '分管领导标识', detailType: 'FORMITEM', name: 'leaderid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
+, 
+        leadername: new FormItemModel({ caption: '分管领导', detailType: 'FORMITEM', name: 'leadername', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
         showorder: new FormItemModel({ caption: '排序', detailType: 'FORMITEM', name: 'showorder', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
@@ -855,6 +879,30 @@ export default class MainBase extends Vue implements ControlInterface {
         this.formDataChange({ name: 'deptlevel', newVal: newVal, oldVal: oldVal });
     }
 
+    /**
+     * 监控表单属性 leaderid 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof Main
+     */
+    @Watch('data.leaderid')
+    onLeaderidChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'leaderid', newVal: newVal, oldVal: oldVal });
+    }
+
+    /**
+     * 监控表单属性 leadername 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof Main
+     */
+    @Watch('data.leadername')
+    onLeadernameChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'leadername', newVal: newVal, oldVal: oldVal });
+    }
+
     /**
      * 监控表单属性 showorder 值
      *
@@ -946,6 +994,8 @@ export default class MainBase extends Vue implements ControlInterface {
 
 
 
+
+
 
 
 

app_web/src/widgets/ibzdepartment/main-form/main-form-model.ts

@@ -105,6 +105,16 @@ export default class MainModel {
         prop: 'deptlevel',
         dataType: 'INT',
       },
+      {
+        name: 'leaderid',
+        prop: 'leaderid',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'leadername',
+        prop: 'leadername',
+        dataType: 'TEXT',
+      },
       {
         name: 'showorder',
         prop: 'showorder',

app_web/src/widgets/ibzdepartment/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts

@@ -42,6 +42,12 @@ export default class PickupViewpickupviewpanelModel {
       {
         name: 'bcode',
       },
+      {
+        name: 'leaderid',
+      },
+      {
+        name: 'leadername',
+      },
       {
         name: 'enable',
       },

config.xml

@@ -37,6 +37,11 @@
 	  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>

ibzou-app/ibzou-app-web/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
     sleep ${IBZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzou-app-web.jar
 
-EXPOSE 8080
+EXPOSE 30001
 
 ADD ibzou-app-web.jar /ibzou-app-web.jar

ibzou-app/ibzou-app-web/src/main/docker/ibzou-app-web.yaml

@@ -3,9 +3,21 @@ services:
   ibzou-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzou-app-web:latest
     ports:
-      - "8080:8080"
+      - "30001:30001"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
+      - SERVER_PORT=30001
+      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.102.211: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
+      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
+      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
     deploy:
       mode: replicated
       replicas: 1

ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/IBZDepartment.java

@@ -101,6 +101,20 @@ public class IBZDepartment extends EntityMP implements Serializable {
     @JSONField(name = "bcode")
     @JsonProperty("bcode")
     private String bcode;
+    /**
+     * 分管领导标识
+     */
+    @TableField(value = "leaderid")
+    @JSONField(name = "leaderid")
+    @JsonProperty("leaderid")
+    private String leaderid;
+    /**
+     * 分管领导
+     */
+    @TableField(value = "leadername")
+    @JSONField(name = "leadername")
+    @JsonProperty("leadername")
+    private String leadername;
     /**
      * 逻辑有效
      */
@@ -210,6 +224,20 @@ public class IBZDepartment extends EntityMP implements Serializable {
         this.bcode = bcode ;
         this.modify("bcode",bcode);
     }
+    /**
+     * 设置 [分管领导标识]
+     */
+    public void setLeaderid(String leaderid){
+        this.leaderid = leaderid ;
+        this.modify("leaderid",leaderid);
+    }
+    /**
+     * 设置 [分管领导]
+     */
+    public void setLeadername(String leadername){
+        this.leadername = leadername ;
+        this.modify("leadername",leadername);
+    }
 
 }
 

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

@@ -106,7 +106,7 @@
         </createTable>
     </changeSet>
     <!--输出实体[IBZDEPT]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-ibzdept-532-3">
+    <changeSet author="a_A_5d9d78509" id="tab-ibzdept-538-3">
         <createTable tableName="IBZDEPT">
                 <column name="DEPTID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_IBZDEPT_DEPTID"/>
@@ -127,6 +127,10 @@
                 </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">
@@ -148,10 +152,10 @@
        <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>
         <!--输出实体[IBZDEPT]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-ibzdept-532-7">
+    <changeSet author="a_A_5d9d78509" id="fk-ibzdept-538-7">
        <addForeignKeyConstraint baseColumnNames="PDEPTID" baseTableName="IBZDEPT" constraintName="DER1N_IBZDEPT_IBZDEPT_PDEPTID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="DEPTID" referencedTableName="IBZDEPT" validate="true"/>
     </changeSet>
-    <changeSet author="a_A_5d9d78509" id="fk-ibzdept-532-8">
+    <changeSet author="a_A_5d9d78509" id="fk-ibzdept-538-8">
        <addForeignKeyConstraint baseColumnNames="ORGID" baseTableName="IBZDEPT" constraintName="DER1N_IBZDEPT_IBZORG_ORGID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGID" referencedTableName="IBZORG" validate="true"/>
     </changeSet>
 

ibzou-core/src/main/resources/mapper/ou/ibzdepartment/IBZDepartmentMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="IBZDepartmentResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`BCODE`, t1.`CREATEDATE`, t1.`DEPTCODE`, t1.`DEPTID`, t1.`DEPTLEVEL`, t1.`DEPTNAME`, t1.`ENABLE`, 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.`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}]]>
     </select>
 	<select id="selectById"  resultMap="IBZDepartmentResultMap" databaseId="postgresql">
         <![CDATA[select t1.* from (SELECT t1.BCODE, t1.CREATEDATE, t1.DEPTCODE, t1.DEPTID, t1.DEPTLEVEL, t1.DEPTNAME, t1.ENABLE, t1.ORGID, t1.PDEPTID, t1.SHORTNAME, t1.SHOWORDER, t1.UPDATEDATE FROM IBZDEPT t1  ) t1 where deptid=#{id}]]>
@@ -60,7 +60,7 @@
 
     <!--数据查询[CurDept]-->
     <sql id="CurDept" databaseId="mysql">
-       <![CDATA[	SELECT t1.`BCODE`, t1.`CREATEDATE`, t1.`DEPTCODE`, t1.`DEPTID`, t1.`DEPTLEVEL`, t1.`DEPTNAME`, t1.`ENABLE`, 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.`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  
 				 WHERE 	t1.ENABLE = 1
 					 AND ( t1.`ORGID` =  #{srf.datacontext.orgid} )
 			]]>
@@ -68,7 +68,7 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`BCODE`, t1.`CREATEDATE`, t1.`DEPTCODE`, t1.`DEPTID`, t1.`DEPTLEVEL`, t1.`DEPTNAME`, t1.`ENABLE`, 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.`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  
 				 WHERE 	t1.ENABLE = 1
 			]]>
     </sql>
@@ -82,7 +82,7 @@
 
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`BCODE`, t1.`CREATEDATE`, t1.`DEPTCODE`, t1.`DEPTID`, t1.`DEPTLEVEL`, t1.`DEPTNAME`, t1.`ENABLE`, 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.`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  
 				 WHERE 	t1.ENABLE = 1
 			]]>
     </sql>

ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/dto/IBZDepartmentDTO.java

@@ -95,6 +95,22 @@ public class IBZDepartmentDTO extends DTOBase implements Serializable {
     @JsonProperty("bcode")
     private String bcode;
 
+    /**
+     * 属性 [LEADERID]
+     *
+     */
+    @JSONField(name = "leaderid")
+    @JsonProperty("leaderid")
+    private String leaderid;
+
+    /**
+     * 属性 [LEADERNAME]
+     *
+     */
+    @JSONField(name = "leadername")
+    @JsonProperty("leadername")
+    private String leadername;
+
     /**
      * 属性 [ENABLE]
      *
@@ -194,6 +210,22 @@ public class IBZDepartmentDTO extends DTOBase implements Serializable {
         this.modify("bcode",bcode);
     }
 
+    /**
+     * 设置 [LEADERID]
+     */
+    public void setLeaderid(String  leaderid){
+        this.leaderid = leaderid ;
+        this.modify("leaderid",leaderid);
+    }
+
+    /**
+     * 设置 [LEADERNAME]
+     */
+    public void setLeadername(String  leadername){
+        this.leadername = leadername ;
+        this.modify("leadername",leadername);
+    }
+
 
 }