ibiz4j 发布系统代码

app_web/src/widgets/ibzdepartment/edit-grid-grid/edit-grid-grid-base.vue

@@ -23,12 +23,11 @@
             </template>
             <template v-if="getColumnState('deptid')">
                 <el-table-column show-overflow-tooltip :prop="'deptid'" :label="$t('entities.ibzdepartment.editgrid_grid.columns.deptid')" :width="150"  :align="'left'" :sortable="'custom'">
-            <template v-slot:header="{column}">
-            <span class="column-header ">
-            
-            {{$t('entities.ibzdepartment.editgrid_grid.columns.deptid')}}
-            </span>
-            </template>
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibzdepartment.editgrid_grid.columns.deptid')}}
+                      </span>
+                    </template>
                     <template v-slot="{row,column}">
                         <template v-if="actualIsOpenEdit">
                             <i-form style="height:100%;" :model="row">
@@ -53,12 +52,11 @@
             </template>
             <template v-if="getColumnState('deptcode')">
                 <el-table-column show-overflow-tooltip :prop="'deptcode'" :label="$t('entities.ibzdepartment.editgrid_grid.columns.deptcode')" :width="150"  :align="'left'" :sortable="'custom'">
-            <template v-slot:header="{column}">
-            <span class="column-header ">
-            
-            {{$t('entities.ibzdepartment.editgrid_grid.columns.deptcode')}}
-            </span>
-            </template>
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibzdepartment.editgrid_grid.columns.deptcode')}}
+                      </span>
+                    </template>
                     <template v-slot="{row,column}">
                         <template v-if="actualIsOpenEdit">
                             <i-form style="height:100%;" :model="row">
@@ -83,12 +81,11 @@
             </template>
             <template v-if="getColumnState('deptname')">
                 <el-table-column show-overflow-tooltip :prop="'deptname'" :label="$t('entities.ibzdepartment.editgrid_grid.columns.deptname')" :width="150"  :align="'left'" :sortable="'custom'">
-            <template v-slot:header="{column}">
-            <span class="column-header ">
-            
-            {{$t('entities.ibzdepartment.editgrid_grid.columns.deptname')}}
-            </span>
-            </template>
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibzdepartment.editgrid_grid.columns.deptname')}}
+                      </span>
+                    </template>
                     <template v-slot="{row,column}">
                         <template v-if="actualIsOpenEdit">
                             <i-form style="height:100%;" :model="row">
@@ -113,12 +110,11 @@
             </template>
             <template v-if="getColumnState('shortname')">
                 <el-table-column show-overflow-tooltip :prop="'shortname'" :label="$t('entities.ibzdepartment.editgrid_grid.columns.shortname')" :width="150"  :align="'left'" :sortable="'custom'">
-            <template v-slot:header="{column}">
-            <span class="column-header ">
-            
-            {{$t('entities.ibzdepartment.editgrid_grid.columns.shortname')}}
-            </span>
-            </template>
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibzdepartment.editgrid_grid.columns.shortname')}}
+                      </span>
+                    </template>
                     <template v-slot="{row,column}">
                         <template v-if="actualIsOpenEdit">
                             <i-form style="height:100%;" :model="row">
@@ -143,12 +139,11 @@
             </template>
             <template v-if="getColumnState('deptlevel')">
                 <el-table-column show-overflow-tooltip :prop="'deptlevel'" :label="$t('entities.ibzdepartment.editgrid_grid.columns.deptlevel')" :width="150"  :align="'left'" :sortable="'custom'">
-            <template v-slot:header="{column}">
-            <span class="column-header ">
-            
-            {{$t('entities.ibzdepartment.editgrid_grid.columns.deptlevel')}}
-            </span>
-            </template>
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibzdepartment.editgrid_grid.columns.deptlevel')}}
+                      </span>
+                    </template>
                     <template v-slot="{row,column}">
                         <template v-if="actualIsOpenEdit">
                             <i-form style="height:100%;" :model="row">
@@ -173,12 +168,11 @@
             </template>
             <template v-if="getColumnState('bcode')">
                 <el-table-column show-overflow-tooltip :prop="'bcode'" :label="$t('entities.ibzdepartment.editgrid_grid.columns.bcode')" :width="150"  :align="'left'" :sortable="'custom'">
-            <template v-slot:header="{column}">
-            <span class="column-header ">
-            
-            {{$t('entities.ibzdepartment.editgrid_grid.columns.bcode')}}
-            </span>
-            </template>
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibzdepartment.editgrid_grid.columns.bcode')}}
+                      </span>
+                    </template>
                     <template v-slot="{row,column}">
                         <template v-if="actualIsOpenEdit">
                             <i-form style="height:100%;" :model="row">
@@ -203,12 +197,11 @@
             </template>
             <template v-if="getColumnState('showorder')">
                 <el-table-column show-overflow-tooltip :prop="'showorder'" :label="$t('entities.ibzdepartment.editgrid_grid.columns.showorder')" :width="150"  :align="'left'" :sortable="'custom'">
-            <template v-slot:header="{column}">
-            <span class="column-header ">
-            
-            {{$t('entities.ibzdepartment.editgrid_grid.columns.showorder')}}
-            </span>
-            </template>
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibzdepartment.editgrid_grid.columns.showorder')}}
+                      </span>
+                    </template>
                     <template v-slot="{row,column}">
                         <template v-if="actualIsOpenEdit">
                             <i-form style="height:100%;" :model="row">
@@ -233,12 +226,11 @@
             </template>
             <template v-if="getColumnState('createdate')">
                 <el-table-column show-overflow-tooltip :prop="'createdate'" :label="$t('entities.ibzdepartment.editgrid_grid.columns.createdate')" :width="200"  :align="'left'" :sortable="'custom'">
-            <template v-slot:header="{column}">
-            <span class="column-header ">
-            
-            {{$t('entities.ibzdepartment.editgrid_grid.columns.createdate')}}
-            </span>
-            </template>
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibzdepartment.editgrid_grid.columns.createdate')}}
+                      </span>
+                    </template>
                     <template v-slot="{row,column}">
                         <app-format-data format="YYYY-MM-DD hh:mm:ss" :data="row.createdate"></app-format-data>
                     </template>
@@ -246,12 +238,11 @@
             </template>
             <template v-if="getColumnState('updatedate')">
                 <el-table-column show-overflow-tooltip :prop="'updatedate'" :label="$t('entities.ibzdepartment.editgrid_grid.columns.updatedate')" :width="200"  :align="'left'" :sortable="'custom'">
-            <template v-slot:header="{column}">
-            <span class="column-header ">
-            
-            {{$t('entities.ibzdepartment.editgrid_grid.columns.updatedate')}}
-            </span>
-            </template>
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibzdepartment.editgrid_grid.columns.updatedate')}}
+                      </span>
+                    </template>
                     <template v-slot="{row,column}">
                         <app-format-data format="YYYY-MM-DD hh:mm:ss" :data="row.updatedate"></app-format-data>
                     </template>

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

@@ -52,7 +52,7 @@
   :value='data.leadername'
   valueitem="leaderid"
   :multiple="true"
-  filter="srforgid"
+  filter="orgid"
   :fillmap="{'id':'leaderid','label':'leadername'}"
   :disabled="detailsModel.leadername.disabled"
   :data="data"

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

@@ -23,12 +23,11 @@
             </template>
             <template v-if="getColumnState('deptid')">
                 <el-table-column show-overflow-tooltip :prop="'deptid'" :label="$t('entities.ibzdepartment.main_grid.columns.deptid')" :width="150"  :align="'left'" :sortable="'custom'">
-            <template v-slot:header="{column}">
-            <span class="column-header ">
-            
-            {{$t('entities.ibzdepartment.main_grid.columns.deptid')}}
-            </span>
-            </template>
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibzdepartment.main_grid.columns.deptid')}}
+                      </span>
+                    </template>
                     <template v-slot="{row,column}">
                         <span>{{row.deptid}}</span>
                     </template>
@@ -36,12 +35,11 @@
             </template>
             <template v-if="getColumnState('deptcode')">
                 <el-table-column show-overflow-tooltip :prop="'deptcode'" :label="$t('entities.ibzdepartment.main_grid.columns.deptcode')" :width="150"  :align="'left'" :sortable="'custom'">
-            <template v-slot:header="{column}">
-            <span class="column-header ">
-            
-            {{$t('entities.ibzdepartment.main_grid.columns.deptcode')}}
-            </span>
-            </template>
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibzdepartment.main_grid.columns.deptcode')}}
+                      </span>
+                    </template>
                     <template v-slot="{row,column}">
                         <span>{{row.deptcode}}</span>
                     </template>
@@ -49,12 +47,11 @@
             </template>
             <template v-if="getColumnState('deptname')">
                 <el-table-column show-overflow-tooltip :prop="'deptname'" :label="$t('entities.ibzdepartment.main_grid.columns.deptname')" :width="150"  :align="'left'" :sortable="'custom'">
-            <template v-slot:header="{column}">
-            <span class="column-header ">
-            
-            {{$t('entities.ibzdepartment.main_grid.columns.deptname')}}
-            </span>
-            </template>
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibzdepartment.main_grid.columns.deptname')}}
+                      </span>
+                    </template>
                     <template v-slot="{row,column}">
                         <span>{{row.deptname}}</span>
                     </template>
@@ -62,12 +59,11 @@
             </template>
             <template v-if="getColumnState('shortname')">
                 <el-table-column show-overflow-tooltip :prop="'shortname'" :label="$t('entities.ibzdepartment.main_grid.columns.shortname')" :width="150"  :align="'left'" :sortable="'custom'">
-            <template v-slot:header="{column}">
-            <span class="column-header ">
-            
-            {{$t('entities.ibzdepartment.main_grid.columns.shortname')}}
-            </span>
-            </template>
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibzdepartment.main_grid.columns.shortname')}}
+                      </span>
+                    </template>
                     <template v-slot="{row,column}">
                         <span>{{row.shortname}}</span>
                     </template>
@@ -75,12 +71,11 @@
             </template>
             <template v-if="getColumnState('deptlevel')">
                 <el-table-column show-overflow-tooltip :prop="'deptlevel'" :label="$t('entities.ibzdepartment.main_grid.columns.deptlevel')" :width="150"  :align="'left'" :sortable="'custom'">
-            <template v-slot:header="{column}">
-            <span class="column-header ">
-            
-            {{$t('entities.ibzdepartment.main_grid.columns.deptlevel')}}
-            </span>
-            </template>
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibzdepartment.main_grid.columns.deptlevel')}}
+                      </span>
+                    </template>
                     <template v-slot="{row,column}">
                         <span>{{row.deptlevel}}</span>
                     </template>
@@ -88,12 +83,11 @@
             </template>
             <template v-if="getColumnState('bcode')">
                 <el-table-column show-overflow-tooltip :prop="'bcode'" :label="$t('entities.ibzdepartment.main_grid.columns.bcode')" :width="150"  :align="'left'" :sortable="'custom'">
-            <template v-slot:header="{column}">
-            <span class="column-header ">
-            
-            {{$t('entities.ibzdepartment.main_grid.columns.bcode')}}
-            </span>
-            </template>
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibzdepartment.main_grid.columns.bcode')}}
+                      </span>
+                    </template>
                     <template v-slot="{row,column}">
                         <span>{{row.bcode}}</span>
                     </template>
@@ -101,12 +95,11 @@
             </template>
             <template v-if="getColumnState('showorder')">
                 <el-table-column show-overflow-tooltip :prop="'showorder'" :label="$t('entities.ibzdepartment.main_grid.columns.showorder')" :width="150"  :align="'left'" :sortable="'custom'">
-            <template v-slot:header="{column}">
-            <span class="column-header ">
-            
-            {{$t('entities.ibzdepartment.main_grid.columns.showorder')}}
-            </span>
-            </template>
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibzdepartment.main_grid.columns.showorder')}}
+                      </span>
+                    </template>
                     <template v-slot="{row,column}">
                         <span>{{row.showorder}}</span>
                     </template>
@@ -114,12 +107,11 @@
             </template>
             <template v-if="getColumnState('createdate')">
                 <el-table-column show-overflow-tooltip :prop="'createdate'" :label="$t('entities.ibzdepartment.main_grid.columns.createdate')" :width="200"  :align="'left'" :sortable="'custom'">
-            <template v-slot:header="{column}">
-            <span class="column-header ">
-            
-            {{$t('entities.ibzdepartment.main_grid.columns.createdate')}}
-            </span>
-            </template>
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibzdepartment.main_grid.columns.createdate')}}
+                      </span>
+                    </template>
                     <template v-slot="{row,column}">
                         <app-format-data format="YYYY-MM-DD hh:mm:ss" :data="row.createdate"></app-format-data>
                     </template>
@@ -127,12 +119,11 @@
             </template>
             <template v-if="getColumnState('updatedate')">
                 <el-table-column show-overflow-tooltip :prop="'updatedate'" :label="$t('entities.ibzdepartment.main_grid.columns.updatedate')" :width="200"  :align="'left'" :sortable="'custom'">
-            <template v-slot:header="{column}">
-            <span class="column-header ">
-            
-            {{$t('entities.ibzdepartment.main_grid.columns.updatedate')}}
-            </span>
-            </template>
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibzdepartment.main_grid.columns.updatedate')}}
+                      </span>
+                    </template>
                     <template v-slot="{row,column}">
                         <app-format-data format="YYYY-MM-DD hh:mm:ss" :data="row.updatedate"></app-format-data>
                     </template>

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

@@ -20,13 +20,13 @@
 </i-col>
 <i-col v-show="detailsModel.orgname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='orgname' :itemRules="this.rules.orgname" class='' :caption="$t('entities.ibzdepartment.newform_form.details.orgname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.orgname.error" :isEmptyCaption="false" labelPos="LEFT">
-    <app-org-select :data="data" :context="JSON.parse(JSON.stringify(context))" :fillMap="{'id':'orgid','label':'orgname'}" :multiple="false" style="" @select-change="onFormItemValueChange"></app-org-select>
+    <app-org-select :data="data" :context="JSON.parse(JSON.stringify(context))" :fillMap="{'id':'orgid','label':'orgname'}" filter="srforgid" :multiple="false" style="" @select-change="onFormItemValueChange"></app-org-select>
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.pdeptname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='pdeptname' :itemRules="this.rules.pdeptname" class='' :caption="$t('entities.ibzdepartment.newform_form.details.pdeptname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.pdeptname.error" :isEmptyCaption="false" labelPos="LEFT">
-    <app-department-select :data="data" :context="JSON.parse(JSON.stringify(context))" :fillMap="{'id':'pdeptid','label':'pdeptname'}" :multiple="false" style="" @select-change="onFormItemValueChange"></app-department-select>
+    <app-department-select :data="data" :context="JSON.parse(JSON.stringify(context))" :fillMap="{'id':'pdeptid','label':'pdeptname'}" filter="srforgid" :multiple="false" style="" @select-change="onFormItemValueChange"></app-department-select>
 </app-form-item>
 
 </i-col>

app_web/src/widgets/ibzdept-member/main-grid/main-grid-base.vue

@@ -23,12 +23,11 @@
             </template>
             <template v-if="getColumnState('deptname')">
                 <el-table-column show-overflow-tooltip :prop="'deptname'" :label="$t('entities.ibzdeptmember.main_grid.columns.deptname')" :width="250"  :align="'left'" :sortable="'custom'">
-            <template v-slot:header="{column}">
-            <span class="column-header ">
-            
-            {{$t('entities.ibzdeptmember.main_grid.columns.deptname')}}
-            </span>
-            </template>
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibzdeptmember.main_grid.columns.deptname')}}
+                      </span>
+                    </template>
                     <template v-slot="{row,column}">
                         <template v-if="actualIsOpenEdit">
                             <i-form style="height:100%;" :model="row">
@@ -45,12 +44,11 @@
             </template>
             <template v-if="getColumnState('personname')">
                 <el-table-column show-overflow-tooltip :prop="'personname'" :label="$t('entities.ibzdeptmember.main_grid.columns.personname')" :width="250"  :align="'left'" :sortable="'custom'">
-            <template v-slot:header="{column}">
-            <span class="column-header ">
-            
-            {{$t('entities.ibzdeptmember.main_grid.columns.personname')}}
-            </span>
-            </template>
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibzdeptmember.main_grid.columns.personname')}}
+                      </span>
+                    </template>
                     <template v-slot="{row,column}">
                         <span>{{row.personname}}</span>
                     </template>
@@ -58,12 +56,11 @@
             </template>
             <template v-if="getColumnState('deptid')">
                 <el-table-column show-overflow-tooltip :prop="'deptid'" :label="$t('entities.ibzdeptmember.main_grid.columns.deptid')" :width="100"  :align="'left'" :sortable="'custom'">
-            <template v-slot:header="{column}">
-            <span class="column-header ">
-            
-            {{$t('entities.ibzdeptmember.main_grid.columns.deptid')}}
-            </span>
-            </template>
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibzdeptmember.main_grid.columns.deptid')}}
+                      </span>
+                    </template>
                     <template v-slot="{row,column}">
                         <template v-if="actualIsOpenEdit">
                             <i-form style="height:100%;" :model="row">

app_web/src/widgets/ibzemployee/edit-grid-grid/edit-grid-grid-base.vue

@@ -23,12 +23,11 @@
             </template>
             <template v-if="getColumnState('usercode')">
                 <el-table-column show-overflow-tooltip :prop="'usercode'" :label="$t('entities.ibzemployee.editgrid_grid.columns.usercode')" :width="150"  :align="'left'" :sortable="'custom'">
-            <template v-slot:header="{column}">
-            <span class="column-header ">
-            
-            {{$t('entities.ibzemployee.editgrid_grid.columns.usercode')}}
-            </span>
-            </template>
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibzemployee.editgrid_grid.columns.usercode')}}
+                      </span>
+                    </template>
                     <template v-slot="{row,column}">
                         <template v-if="actualIsOpenEdit">
                             <i-form style="height:100%;" :model="row">
@@ -53,12 +52,11 @@
             </template>
             <template v-if="getColumnState('personname')">
                 <el-table-column show-overflow-tooltip :prop="'personname'" :label="$t('entities.ibzemployee.editgrid_grid.columns.personname')" :width="150"  :align="'left'" :sortable="'custom'">
-            <template v-slot:header="{column}">
-            <span class="column-header ">
-            
-            {{$t('entities.ibzemployee.editgrid_grid.columns.personname')}}
-            </span>
-            </template>
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibzemployee.editgrid_grid.columns.personname')}}
+                      </span>
+                    </template>
                     <template v-slot="{row,column}">
                         <template v-if="actualIsOpenEdit">
                             <i-form style="height:100%;" :model="row">
@@ -83,12 +81,11 @@
             </template>
             <template v-if="getColumnState('loginname')">
                 <el-table-column show-overflow-tooltip :prop="'loginname'" :label="$t('entities.ibzemployee.editgrid_grid.columns.loginname')" :width="150"  :align="'left'" :sortable="'custom'">
-            <template v-slot:header="{column}">
-            <span class="column-header ">
-            
-            {{$t('entities.ibzemployee.editgrid_grid.columns.loginname')}}
-            </span>
-            </template>
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibzemployee.editgrid_grid.columns.loginname')}}
+                      </span>
+                    </template>
                     <template v-slot="{row,column}">
                         <template v-if="actualIsOpenEdit">
                             <i-form style="height:100%;" :model="row">
@@ -113,12 +110,11 @@
             </template>
             <template v-if="getColumnState('orgcode')">
                 <el-table-column show-overflow-tooltip :prop="'orgcode'" :label="$t('entities.ibzemployee.editgrid_grid.columns.orgcode')" :width="150"  :align="'left'" :sortable="'custom'">
-            <template v-slot:header="{column}">
-            <span class="column-header ">
-            
-            {{$t('entities.ibzemployee.editgrid_grid.columns.orgcode')}}
-            </span>
-            </template>
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibzemployee.editgrid_grid.columns.orgcode')}}
+                      </span>
+                    </template>
                     <template v-slot="{row,column}">
                         <span>{{row.orgcode}}</span>
                     </template>
@@ -126,12 +122,11 @@
             </template>
             <template v-if="getColumnState('orgname')">
                 <el-table-column show-overflow-tooltip :prop="'orgname'" :label="$t('entities.ibzemployee.editgrid_grid.columns.orgname')" :width="150"  :align="'left'" :sortable="'custom'">
-            <template v-slot:header="{column}">
-            <span class="column-header ">
-            
-            {{$t('entities.ibzemployee.editgrid_grid.columns.orgname')}}
-            </span>
-            </template>
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibzemployee.editgrid_grid.columns.orgname')}}
+                      </span>
+                    </template>
                     <template v-slot="{row,column}">
                         <template v-if="actualIsOpenEdit">
                             <i-form style="height:100%;" :model="row">
@@ -167,12 +162,11 @@
             </template>
             <template v-if="getColumnState('mdeptcode')">
                 <el-table-column show-overflow-tooltip :prop="'mdeptcode'" :label="$t('entities.ibzemployee.editgrid_grid.columns.mdeptcode')" :width="150"  :align="'left'" :sortable="'custom'">
-            <template v-slot:header="{column}">
-            <span class="column-header ">
-            
-            {{$t('entities.ibzemployee.editgrid_grid.columns.mdeptcode')}}
-            </span>
-            </template>
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibzemployee.editgrid_grid.columns.mdeptcode')}}
+                      </span>
+                    </template>
                     <template v-slot="{row,column}">
                         <span>{{row.mdeptcode}}</span>
                     </template>
@@ -180,12 +174,11 @@
             </template>
             <template v-if="getColumnState('mdeptname')">
                 <el-table-column show-overflow-tooltip :prop="'mdeptname'" :label="$t('entities.ibzemployee.editgrid_grid.columns.mdeptname')" :width="150"  :align="'left'" :sortable="'custom'">
-            <template v-slot:header="{column}">
-            <span class="column-header ">
-            
-            {{$t('entities.ibzemployee.editgrid_grid.columns.mdeptname')}}
-            </span>
-            </template>
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibzemployee.editgrid_grid.columns.mdeptname')}}
+                      </span>
+                    </template>
                     <template v-slot="{row,column}">
                         <template v-if="actualIsOpenEdit">
                             <i-form style="height:100%;" :model="row">
@@ -221,12 +214,11 @@
             </template>
             <template v-if="getColumnState('sex')">
                 <el-table-column show-overflow-tooltip :prop="'sex'" :label="$t('entities.ibzemployee.editgrid_grid.columns.sex')" :width="150"  :align="'left'" :sortable="'custom'">
-            <template v-slot:header="{column}">
-            <span class="column-header ">
-            
-            {{$t('entities.ibzemployee.editgrid_grid.columns.sex')}}
-            </span>
-            </template>
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibzemployee.editgrid_grid.columns.sex')}}
+                      </span>
+                    </template>
                     <template v-slot="{row,column}">
                         <template v-if="actualIsOpenEdit">
                             <i-form style="height:100%;" :model="row">
@@ -243,12 +235,11 @@
             </template>
             <template v-if="getColumnState('phone')">
                 <el-table-column show-overflow-tooltip :prop="'phone'" :label="$t('entities.ibzemployee.editgrid_grid.columns.phone')" :width="150"  :align="'left'" :sortable="'custom'">
-            <template v-slot:header="{column}">
-            <span class="column-header ">
-            
-            {{$t('entities.ibzemployee.editgrid_grid.columns.phone')}}
-            </span>
-            </template>
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibzemployee.editgrid_grid.columns.phone')}}
+                      </span>
+                    </template>
                     <template v-slot="{row,column}">
                         <template v-if="actualIsOpenEdit">
                             <i-form style="height:100%;" :model="row">
@@ -273,12 +264,11 @@
             </template>
             <template v-if="getColumnState('ipaddr')">
                 <el-table-column show-overflow-tooltip :prop="'ipaddr'" :label="$t('entities.ibzemployee.editgrid_grid.columns.ipaddr')" :width="150"  :align="'left'" :sortable="'custom'">
-            <template v-slot:header="{column}">
-            <span class="column-header ">
-            
-            {{$t('entities.ibzemployee.editgrid_grid.columns.ipaddr')}}
-            </span>
-            </template>
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibzemployee.editgrid_grid.columns.ipaddr')}}
+                      </span>
+                    </template>
                     <template v-slot="{row,column}">
                         <template v-if="actualIsOpenEdit">
                             <i-form style="height:100%;" :model="row">
@@ -303,12 +293,11 @@
             </template>
             <template v-if="getColumnState('showorder')">
                 <el-table-column show-overflow-tooltip :prop="'showorder'" :label="$t('entities.ibzemployee.editgrid_grid.columns.showorder')" :width="150"  :align="'left'" :sortable="'custom'">
-            <template v-slot:header="{column}">
-            <span class="column-header ">
-            
-            {{$t('entities.ibzemployee.editgrid_grid.columns.showorder')}}
-            </span>
-            </template>
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibzemployee.editgrid_grid.columns.showorder')}}
+                      </span>
+                    </template>
                     <template v-slot="{row,column}">
                         <template v-if="actualIsOpenEdit">
                             <i-form style="height:100%;" :model="row">

app_web/src/widgets/ibzemployee/main-grid/main-grid-base.vue

@@ -23,12 +23,11 @@
             </template>
             <template v-if="getColumnState('usercode')">
                 <el-table-column show-overflow-tooltip :prop="'usercode'" :label="$t('entities.ibzemployee.main_grid.columns.usercode')" :width="150"  :align="'left'" :sortable="'custom'">
-            <template v-slot:header="{column}">
-            <span class="column-header ">
-            
-            {{$t('entities.ibzemployee.main_grid.columns.usercode')}}
-            </span>
-            </template>
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibzemployee.main_grid.columns.usercode')}}
+                      </span>
+                    </template>
                     <template v-slot="{row,column}">
                         <span>{{row.usercode}}</span>
                     </template>
@@ -36,12 +35,11 @@
             </template>
             <template v-if="getColumnState('personname')">
                 <el-table-column show-overflow-tooltip :prop="'personname'" :label="$t('entities.ibzemployee.main_grid.columns.personname')" :width="150"  :align="'left'" :sortable="'custom'">
-            <template v-slot:header="{column}">
-            <span class="column-header ">
-            
-            {{$t('entities.ibzemployee.main_grid.columns.personname')}}
-            </span>
-            </template>
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibzemployee.main_grid.columns.personname')}}
+                      </span>
+                    </template>
                     <template v-slot="{row,column}">
                         <span>{{row.personname}}</span>
                     </template>
@@ -49,12 +47,11 @@
             </template>
             <template v-if="getColumnState('loginname')">
                 <el-table-column show-overflow-tooltip :prop="'loginname'" :label="$t('entities.ibzemployee.main_grid.columns.loginname')" :width="150"  :align="'left'" :sortable="'custom'">
-            <template v-slot:header="{column}">
-            <span class="column-header ">
-            
-            {{$t('entities.ibzemployee.main_grid.columns.loginname')}}
-            </span>
-            </template>
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibzemployee.main_grid.columns.loginname')}}
+                      </span>
+                    </template>
                     <template v-slot="{row,column}">
                         <span>{{row.loginname}}</span>
                     </template>
@@ -62,12 +59,11 @@
             </template>
             <template v-if="getColumnState('orgcode')">
                 <el-table-column show-overflow-tooltip :prop="'orgcode'" :label="$t('entities.ibzemployee.main_grid.columns.orgcode')" :width="150"  :align="'left'" :sortable="'custom'">
-            <template v-slot:header="{column}">
-            <span class="column-header ">
-            
-            {{$t('entities.ibzemployee.main_grid.columns.orgcode')}}
-            </span>
-            </template>
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibzemployee.main_grid.columns.orgcode')}}
+                      </span>
+                    </template>
                     <template v-slot="{row,column}">
                         <span>{{row.orgcode}}</span>
                     </template>
@@ -75,12 +71,11 @@
             </template>
             <template v-if="getColumnState('orgname')">
                 <el-table-column show-overflow-tooltip :prop="'orgname'" :label="$t('entities.ibzemployee.main_grid.columns.orgname')" :width="150"  :align="'left'" :sortable="'custom'">
-            <template v-slot:header="{column}">
-            <span class="column-header ">
-            
-            {{$t('entities.ibzemployee.main_grid.columns.orgname')}}
-            </span>
-            </template>
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibzemployee.main_grid.columns.orgname')}}
+                      </span>
+                    </template>
                     <template v-slot="{row,column}">
                         <span>{{row.orgname}}</span>
                     </template>
@@ -88,12 +83,11 @@
             </template>
             <template v-if="getColumnState('mdeptcode')">
                 <el-table-column show-overflow-tooltip :prop="'mdeptcode'" :label="$t('entities.ibzemployee.main_grid.columns.mdeptcode')" :width="150"  :align="'left'" :sortable="'custom'">
-            <template v-slot:header="{column}">
-            <span class="column-header ">
-            
-            {{$t('entities.ibzemployee.main_grid.columns.mdeptcode')}}
-            </span>
-            </template>
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibzemployee.main_grid.columns.mdeptcode')}}
+                      </span>
+                    </template>
                     <template v-slot="{row,column}">
                         <span>{{row.mdeptcode}}</span>
                     </template>
@@ -101,12 +95,11 @@
             </template>
             <template v-if="getColumnState('mdeptname')">
                 <el-table-column show-overflow-tooltip :prop="'mdeptname'" :label="$t('entities.ibzemployee.main_grid.columns.mdeptname')" :width="150"  :align="'left'" :sortable="'custom'">
-            <template v-slot:header="{column}">
-            <span class="column-header ">
-            
-            {{$t('entities.ibzemployee.main_grid.columns.mdeptname')}}
-            </span>
-            </template>
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibzemployee.main_grid.columns.mdeptname')}}
+                      </span>
+                    </template>
                     <template v-slot="{row,column}">
                         <span>{{row.mdeptname}}</span>
                     </template>
@@ -114,12 +107,11 @@
             </template>
             <template v-if="getColumnState('sex')">
                 <el-table-column show-overflow-tooltip :prop="'sex'" :label="$t('entities.ibzemployee.main_grid.columns.sex')" :width="150"  :align="'left'" :sortable="'custom'">
-            <template v-slot:header="{column}">
-            <span class="column-header ">
-            
-            {{$t('entities.ibzemployee.main_grid.columns.sex')}}
-            </span>
-            </template>
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibzemployee.main_grid.columns.sex')}}
+                      </span>
+                    </template>
                     <template v-slot="{row,column}">
                         <template >
             <codelist :value="row.sex" tag='CLIBZSex' codelistType='STATIC' ></codelist>
@@ -129,12 +121,11 @@
             </template>
             <template v-if="getColumnState('phone')">
                 <el-table-column show-overflow-tooltip :prop="'phone'" :label="$t('entities.ibzemployee.main_grid.columns.phone')" :width="150"  :align="'left'" :sortable="'custom'">
-            <template v-slot:header="{column}">
-            <span class="column-header ">
-            
-            {{$t('entities.ibzemployee.main_grid.columns.phone')}}
-            </span>
-            </template>
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibzemployee.main_grid.columns.phone')}}
+                      </span>
+                    </template>
                     <template v-slot="{row,column}">
                         <span>{{row.phone}}</span>
                     </template>
@@ -142,12 +133,11 @@
             </template>
             <template v-if="getColumnState('ipaddr')">
                 <el-table-column show-overflow-tooltip :prop="'ipaddr'" :label="$t('entities.ibzemployee.main_grid.columns.ipaddr')" :width="150"  :align="'left'" :sortable="'custom'">
-            <template v-slot:header="{column}">
-            <span class="column-header ">
-            
-            {{$t('entities.ibzemployee.main_grid.columns.ipaddr')}}
-            </span>
-            </template>
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibzemployee.main_grid.columns.ipaddr')}}
+                      </span>
+                    </template>
                     <template v-slot="{row,column}">
                         <span>{{row.ipaddr}}</span>
                     </template>
@@ -155,12 +145,11 @@
             </template>
             <template v-if="getColumnState('showorder')">
                 <el-table-column show-overflow-tooltip :prop="'showorder'" :label="$t('entities.ibzemployee.main_grid.columns.showorder')" :width="150"  :align="'left'" :sortable="'custom'">
-            <template v-slot:header="{column}">
-            <span class="column-header ">
-            
-            {{$t('entities.ibzemployee.main_grid.columns.showorder')}}
-            </span>
-            </template>
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibzemployee.main_grid.columns.showorder')}}
+                      </span>
+                    </template>
                     <template v-slot="{row,column}">
                         <span>{{row.showorder}}</span>
                     </template>

app_web/src/widgets/ibzorganization/main-grid/main-grid-base.vue

@@ -23,12 +23,11 @@
             </template>
             <template v-if="getColumnState('orgid')">
                 <el-table-column show-overflow-tooltip :prop="'orgid'" :label="$t('entities.ibzorganization.main_grid.columns.orgid')" :width="150"  :align="'left'" :sortable="'custom'">
-            <template v-slot:header="{column}">
-            <span class="column-header ">
-            
-            {{$t('entities.ibzorganization.main_grid.columns.orgid')}}
-            </span>
-            </template>
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibzorganization.main_grid.columns.orgid')}}
+                      </span>
+                    </template>
                     <template v-slot="{row,column}">
                         <span>{{row.orgid}}</span>
                     </template>
@@ -36,12 +35,11 @@
             </template>
             <template v-if="getColumnState('orgcode')">
                 <el-table-column show-overflow-tooltip :prop="'orgcode'" :label="$t('entities.ibzorganization.main_grid.columns.orgcode')" :width="150"  :align="'left'" :sortable="'custom'">
-            <template v-slot:header="{column}">
-            <span class="column-header ">
-            
-            {{$t('entities.ibzorganization.main_grid.columns.orgcode')}}
-            </span>
-            </template>
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibzorganization.main_grid.columns.orgcode')}}
+                      </span>
+                    </template>
                     <template v-slot="{row,column}">
                         <span>{{row.orgcode}}</span>
                     </template>
@@ -49,12 +47,11 @@
             </template>
             <template v-if="getColumnState('orgname')">
                 <el-table-column show-overflow-tooltip :prop="'orgname'" :label="$t('entities.ibzorganization.main_grid.columns.orgname')" :width="200"  :align="'left'" :sortable="'custom'">
-            <template v-slot:header="{column}">
-            <span class="column-header ">
-            
-            {{$t('entities.ibzorganization.main_grid.columns.orgname')}}
-            </span>
-            </template>
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibzorganization.main_grid.columns.orgname')}}
+                      </span>
+                    </template>
                     <template v-slot="{row,column}">
                         <span>{{row.orgname}}</span>
                     </template>
@@ -62,12 +59,11 @@
             </template>
             <template v-if="getColumnState('orglevel')">
                 <el-table-column show-overflow-tooltip :prop="'orglevel'" :label="$t('entities.ibzorganization.main_grid.columns.orglevel')" :width="150"  :align="'left'" :sortable="'custom'">
-            <template v-slot:header="{column}">
-            <span class="column-header ">
-            
-            {{$t('entities.ibzorganization.main_grid.columns.orglevel')}}
-            </span>
-            </template>
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibzorganization.main_grid.columns.orglevel')}}
+                      </span>
+                    </template>
                     <template v-slot="{row,column}">
                         <span>{{row.orglevel}}</span>
                     </template>
@@ -75,12 +71,11 @@
             </template>
             <template v-if="getColumnState('shortname')">
                 <el-table-column show-overflow-tooltip :prop="'shortname'" :label="$t('entities.ibzorganization.main_grid.columns.shortname')" :width="200"  :align="'left'" :sortable="'custom'">
-            <template v-slot:header="{column}">
-            <span class="column-header ">
-            
-            {{$t('entities.ibzorganization.main_grid.columns.shortname')}}
-            </span>
-            </template>
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibzorganization.main_grid.columns.shortname')}}
+                      </span>
+                    </template>
                     <template v-slot="{row,column}">
                         <span>{{row.shortname}}</span>
                     </template>
@@ -88,12 +83,11 @@
             </template>
             <template v-if="getColumnState('showorder')">
                 <el-table-column show-overflow-tooltip :prop="'showorder'" :label="$t('entities.ibzorganization.main_grid.columns.showorder')" :width="150"  :align="'left'" :sortable="'custom'">
-            <template v-slot:header="{column}">
-            <span class="column-header ">
-            
-            {{$t('entities.ibzorganization.main_grid.columns.showorder')}}
-            </span>
-            </template>
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibzorganization.main_grid.columns.showorder')}}
+                      </span>
+                    </template>
                     <template v-slot="{row,column}">
                         <span>{{row.showorder}}</span>
                     </template>
@@ -101,12 +95,11 @@
             </template>
             <template v-if="getColumnState('createdate')">
                 <el-table-column show-overflow-tooltip :prop="'createdate'" :label="$t('entities.ibzorganization.main_grid.columns.createdate')" :width="200"  :align="'left'" :sortable="'custom'">
-            <template v-slot:header="{column}">
-            <span class="column-header ">
-            
-            {{$t('entities.ibzorganization.main_grid.columns.createdate')}}
-            </span>
-            </template>
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibzorganization.main_grid.columns.createdate')}}
+                      </span>
+                    </template>
                     <template v-slot="{row,column}">
                         <app-format-data format="YYYY-MM-DD hh:mm:ss" :data="row.createdate"></app-format-data>
                     </template>
@@ -114,12 +107,11 @@
             </template>
             <template v-if="getColumnState('updatedate')">
                 <el-table-column show-overflow-tooltip :prop="'updatedate'" :label="$t('entities.ibzorganization.main_grid.columns.updatedate')" :width="200"  :align="'left'" :sortable="'custom'">
-            <template v-slot:header="{column}">
-            <span class="column-header ">
-            
-            {{$t('entities.ibzorganization.main_grid.columns.updatedate')}}
-            </span>
-            </template>
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibzorganization.main_grid.columns.updatedate')}}
+                      </span>
+                    </template>
                     <template v-slot="{row,column}">
                         <app-format-data format="YYYY-MM-DD hh:mm:ss" :data="row.updatedate"></app-format-data>
                     </template>

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

@@ -126,7 +126,7 @@
 
 
     <!--输出实体[IBZDEPT]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-ibzdept-625-4">
+    <changeSet author="a_A_5d9d78509" id="tab-ibzdept-628-4">
         <createTable tableName="IBZDEPT">
                 <column name="DEPTID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_IBZDEPT_DEPTID"/>
@@ -179,10 +179,10 @@
        <addForeignKeyConstraint baseColumnNames="USERID" baseTableName="IBZDEPTMEMBER" constraintName="DER1N_IBZDEPTMEMBER_IBZEMP_USE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="USERID" referencedTableName="IBZEMP" validate="true"/>
     </changeSet>
         <!--输出实体[IBZDEPT]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-ibzdept-625-10">
+    <changeSet author="a_A_5d9d78509" id="fk-ibzdept-628-10">
        <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-625-11">
+    <changeSet author="a_A_5d9d78509" id="fk-ibzdept-628-11">
        <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-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/rest/IBZDepartmentResource.java

@@ -125,10 +125,10 @@ public class IBZDepartmentResource {
 	@RequestMapping(method = RequestMethod.PUT, value = "/ibzdepartments/{ibzdepartment_id}")
     @Transactional
     public ResponseEntity<IBZDepartmentDTO> update(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody IBZDepartmentDTO ibzdepartmentdto) {
-		IBZDepartment domain = ibzdepartmentMapping.toDomain(ibzdepartmentdto);
-        domain.setDeptid(ibzdepartment_id);
-		ibzdepartmentService.update(domain);
-		IBZDepartmentDTO dto = ibzdepartmentMapping.toDto(domain);
+		IBZDepartment domain  = ibzdepartmentMapping.toDomain(ibzdepartmentdto);
+        domain .setDeptid(ibzdepartment_id);
+		ibzdepartmentService.update(domain );
+		IBZDepartmentDTO dto = ibzdepartmentMapping.toDto(domain );
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 

ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/rest/IBZDeptMemberResource.java

@@ -52,10 +52,10 @@ public class IBZDeptMemberResource {
 	@RequestMapping(method = RequestMethod.PUT, value = "/ibzdeptmembers/{ibzdeptmember_id}")
     @Transactional
     public ResponseEntity<IBZDeptMemberDTO> update(@PathVariable("ibzdeptmember_id") String ibzdeptmember_id, @RequestBody IBZDeptMemberDTO ibzdeptmemberdto) {
-		IBZDeptMember domain = ibzdeptmemberMapping.toDomain(ibzdeptmemberdto);
-        domain.setMemberid(ibzdeptmember_id);
-		ibzdeptmemberService.update(domain);
-		IBZDeptMemberDTO dto = ibzdeptmemberMapping.toDto(domain);
+		IBZDeptMember domain  = ibzdeptmemberMapping.toDomain(ibzdeptmemberdto);
+        domain .setMemberid(ibzdeptmember_id);
+		ibzdeptmemberService.update(domain );
+		IBZDeptMemberDTO dto = ibzdeptmemberMapping.toDto(domain );
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 

ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/rest/IBZEmployeeResource.java

@@ -69,6 +69,7 @@ public class IBZEmployeeResource {
     @Transactional
     public ResponseEntity<IBZEmployeeDTO> initPwd(@PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody IBZEmployeeDTO ibzemployeedto) {
         IBZEmployee ibzemployee = ibzemployeeMapping.toDomain(ibzemployeedto);
+        ibzemployee.setUserid(ibzemployee_id);
         ibzemployee = ibzemployeeService.initPwd(ibzemployee);
         ibzemployeedto = ibzemployeeMapping.toDto(ibzemployee);
         return ResponseEntity.status(HttpStatus.OK).body(ibzemployeedto);
@@ -105,10 +106,10 @@ public class IBZEmployeeResource {
 	@RequestMapping(method = RequestMethod.PUT, value = "/ibzemployees/{ibzemployee_id}")
     @Transactional
     public ResponseEntity<IBZEmployeeDTO> update(@PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody IBZEmployeeDTO ibzemployeedto) {
-		IBZEmployee domain = ibzemployeeMapping.toDomain(ibzemployeedto);
-        domain.setUserid(ibzemployee_id);
-		ibzemployeeService.update(domain);
-		IBZEmployeeDTO dto = ibzemployeeMapping.toDto(domain);
+		IBZEmployee domain  = ibzemployeeMapping.toDomain(ibzemployeedto);
+        domain .setUserid(ibzemployee_id);
+		ibzemployeeService.update(domain );
+		IBZEmployeeDTO dto = ibzemployeeMapping.toDto(domain );
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 

ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/rest/IBZOrganizationResource.java

@@ -59,10 +59,10 @@ public class IBZOrganizationResource {
 	@RequestMapping(method = RequestMethod.PUT, value = "/ibzorganizations/{ibzorganization_id}")
     @Transactional
     public ResponseEntity<IBZOrganizationDTO> update(@PathVariable("ibzorganization_id") String ibzorganization_id, @RequestBody IBZOrganizationDTO ibzorganizationdto) {
-		IBZOrganization domain = ibzorganizationMapping.toDomain(ibzorganizationdto);
-        domain.setOrgid(ibzorganization_id);
-		ibzorganizationService.update(domain);
-		IBZOrganizationDTO dto = ibzorganizationMapping.toDto(domain);
+		IBZOrganization domain  = ibzorganizationMapping.toDomain(ibzorganizationdto);
+        domain .setOrgid(ibzorganization_id);
+		ibzorganizationService.update(domain );
+		IBZOrganizationDTO dto = ibzorganizationMapping.toDto(domain );
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }