ibizdev提交

app_web/src/components/app-file-upload/app-file-upload.less

 .app-file-upload{
   .upload-col{
-    text-align: center;
     .button-preview{
       padding: 8px 15px 8.5px 15px;
       .ivu-badge{

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

 
 export default {
+  fields: {
+    deptid: '部门标识',
+    deptcode: '部门代码',
+    deptname: '部门名称',
+    orgid: '单位',
+    parentdeptid: '上级部门',
+    shortname: '部门简称',
+    deptlevel: '部门级别',
+    showorder: '排序',
+    bcode: '业务编码',
+    enable: '逻辑有效',
+    createdate: '创建时间',
+    updatedate: '最后修改时间',
+  },
 	views: {
 		editview: {
 			caption: "部门",

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

 export default {
+  fields: {
+    deptid: '部门标识',
+    deptcode: '部门代码',
+    deptname: '部门名称',
+    orgid: '单位',
+    parentdeptid: '上级部门',
+    shortname: '部门简称',
+    deptlevel: '部门级别',
+    showorder: '排序',
+    bcode: '业务编码',
+    enable: '逻辑有效',
+    createdate: '创建时间',
+    updatedate: '最后修改时间',
+  },
 	views: {
 		editview: {
 			caption: '部门',

app_web/src/locale/lanres/ibzemployee/ibzemployee_en_US.ts

 
 export default {
+  fields: {
+    userid: '用户标示',
+    username: '用户全局名',
+    personname: '姓名',
+    usercode: '用户工号',
+    loginname: '登录名',
+    password: '密码',
+    domains: '区属',
+    mdeptid: '主部门',
+    mdeptcode: '主部门代码',
+    mdeptname: '主部门名称',
+    bcode: '业务编码',
+    postid: '岗位',
+    postcode: '岗位代码',
+    postname: '岗位名称',
+    orgid: '单位',
+    orgcode: '单位代码',
+    orgname: '单位名称',
+    nickname: '昵称别名',
+    sex: '性别',
+    certcode: '证件号码',
+    phone: '联系方式',
+    birthday: '出生日期',
+    email: '邮件',
+    avatar: '社交账号',
+    addr: '地址',
+    usericon: '照片',
+    ipaddr: 'ip地址',
+    theme: '样式',
+    lang: '语言',
+    fontsize: '字号',
+    memo: '备注',
+    reserver: '保留',
+    showorder: '排序',
+    enable: '逻辑有效',
+    createdate: '创建时间',
+    updatedate: '最后修改时间',
+  },
 	views: {
 		editview: {
 			caption: "人员",

app_web/src/locale/lanres/ibzemployee/ibzemployee_zh_CN.ts

 export default {
+  fields: {
+    userid: '用户标示',
+    username: '用户全局名',
+    personname: '姓名',
+    usercode: '用户工号',
+    loginname: '登录名',
+    password: '密码',
+    domains: '区属',
+    mdeptid: '主部门',
+    mdeptcode: '主部门代码',
+    mdeptname: '主部门名称',
+    bcode: '业务编码',
+    postid: '岗位',
+    postcode: '岗位代码',
+    postname: '岗位名称',
+    orgid: '单位',
+    orgcode: '单位代码',
+    orgname: '单位名称',
+    nickname: '昵称别名',
+    sex: '性别',
+    certcode: '证件号码',
+    phone: '联系方式',
+    birthday: '出生日期',
+    email: '邮件',
+    avatar: '社交账号',
+    addr: '地址',
+    usericon: '照片',
+    ipaddr: 'ip地址',
+    theme: '样式',
+    lang: '语言',
+    fontsize: '字号',
+    memo: '备注',
+    reserver: '保留',
+    showorder: '排序',
+    enable: '逻辑有效',
+    createdate: '创建时间',
+    updatedate: '最后修改时间',
+  },
 	views: {
 		editview: {
 			caption: '人员',

app_web/src/locale/lanres/ibzorganization/ibzorganization_en_US.ts

 
 export default {
+  fields: {
+    orgid: '单位标识',
+    orgcode: '单位代码',
+    orgname: '名称',
+    parentorgid: '上级单位',
+    shortname: '单位简称',
+    orglevel: '单位级别',
+    showorder: '排序',
+    enable: '逻辑有效',
+    createdate: '创建时间',
+    updatedate: '最后修改时间',
+  },
 	views: {
 		editview: {
 			caption: "单位机构",

app_web/src/locale/lanres/ibzorganization/ibzorganization_zh_CN.ts

 export default {
+  fields: {
+    orgid: '单位标识',
+    orgcode: '单位代码',
+    orgname: '名称',
+    parentorgid: '上级单位',
+    shortname: '单位简称',
+    orglevel: '单位级别',
+    showorder: '排序',
+    enable: '逻辑有效',
+    createdate: '创建时间',
+    updatedate: '最后修改时间',
+  },
 	views: {
 		editview: {
 			caption: '单位机构',

app_web/src/utils/interceptor/interceptor.ts

 import { Store } from 'vuex';
 import axios from 'axios';
 import Router from 'vue-router';
+import i18n from '@/locale';
 
 
 /**
@@ -81,13 +82,13 @@ export class Interceptors {
                 appdata = this.store.getters.getAppData();
             }
             if (appdata && appdata.context) {
-                config.headers.srforgsectorid = appdata.context.srforgsectorid;
-                //config.headers.srforgsectorname = appdata.context.srforgsectorname;
+                config.headers['srforgsectorid'] = appdata.context.srforgsectorid;
             }
             if (window.localStorage.getItem('token')) {
                 const token = window.localStorage.getItem('token');
-                config.headers.Authorization = `Bearer ${token}`;
+                config.headers['Authorization'] = `Bearer ${token}`;
             }
+            config.headers['Accept-Language'] =  i18n.locale;
             // if (!config.url.startsWith('https://') && !config.url.startsWith('http://')) {
             //     config.url = Environment.BaseUrl + config.url;
             // }

ibzou-app/ibzou-app-web/pom.xml

@@ -22,7 +22,7 @@
     </dependencies>
 
     <properties>
-        <docker.image.prefix>172.16.100.243:5000/ibiz</docker.image.prefix>
+        <docker.image.prefix>registry.cn-shanghai.aliyuncs.com/ibizsys</docker.image.prefix>
     </properties>
 
 
@@ -103,12 +103,13 @@
                             <artifactId>docker-maven-plugin</artifactId>
                             <version>0.4.13</version>
                             <configuration>
+                            <serverId>ibiz-dev</serverId>
                             <imageName>${docker.image.prefix}/${project.artifactId}:latest</imageName>
-                            <dockerDirectory>${project.build.directory}/src/main/docker</dockerDirectory>
+                            <dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory>
                             <resources>
                                 <resource>
                                     <targetPath>/</targetPath>
-                                    <directory>${project.build.directory}</directory>
+                                    <directory>../../</directory>
                                     <include>${project.artifactId}.jar</include>
                                 </resource>
                             </resources>

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

+version: "3.2"
+services:
+  ibzou-app-web:
+    image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzou-app-web:latest
+    ports:
+      - "8080:8080"
+    networks:
+      - agent_network
+    deploy:
+      mode: replicated
+      replicas: 1
+
+networks:
+  agent_network:
+    driver: overlay
+    attachable: true
\ No newline at end of file

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

@@ -146,7 +146,7 @@ public class IBZDepartmentServiceImpl extends ServiceImpl<IBZDepartmentMapper, I
 
     @Override
     public void removeByParentdeptid(String deptid) {
-        this.remove(new QueryWrapper<IBZDepartment>().eq("deptid",deptid));
+        this.remove(new QueryWrapper<IBZDepartment>().eq("pdeptid",deptid));
     }
 
 	@Override

ibzou-core/src/main/java/cn/ibizlab/core/ou/service/impl/IBZEmployeeServiceImpl.java

@@ -147,7 +147,7 @@ public class IBZEmployeeServiceImpl extends ServiceImpl<IBZEmployeeMapper, IBZEm
 
     @Override
     public void removeByMdeptid(String deptid) {
-        this.remove(new QueryWrapper<IBZEmployee>().eq("deptid",deptid));
+        this.remove(new QueryWrapper<IBZEmployee>().eq("mdeptid",deptid));
     }
 
 	@Override

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

@@ -149,7 +149,7 @@ public class IBZOrganizationServiceImpl extends ServiceImpl<IBZOrganizationMappe
 
     @Override
     public void removeByParentorgid(String orgid) {
-        this.remove(new QueryWrapper<IBZOrganization>().eq("orgid",orgid));
+        this.remove(new QueryWrapper<IBZOrganization>().eq("porgid",orgid));
     }
 
 

ibzou-core/src/main/resources/deprivs/DEPrivs.json

@@ -6,7 +6,7 @@
     "delogicname":"部门",
     "sysmoudle":{"id":"OU","name":"组织人事"},
     "dedataset":[{"id":"Default","name":"默认数据集"}],
-    "dedatarange":[{"id":"ALL","name":"全部数据"},{"id":"CUR_ORG","name":"当前部门"}],
+    "dedatarange":[{"id":"ALL","name":"全部数据"},{"id":"CURORG","name":"当前单位"},{"id":"PORG","name":"上级单位"},{"id":"SORG","name":"下级单位"},{"id":"CURORGDEPT","name":"当前部门"},{"id":"PORGDEPT","name":"上级部门"},{"id":"SORGDEPT","name":"下级部门"}],
     "deprivs":[{"id":"READ","name":"READ"},{"id":"CREATE","name":"CREATE"},{"id":"UPDATE","name":"UPDATE"},{"id":"DELETE","name":"DELETE"}]
      }
     ,
@@ -15,7 +15,7 @@
     "delogicname":"人员",
     "sysmoudle":{"id":"OU","name":"组织人事"},
     "dedataset":[{"id":"Default","name":"默认数据集"}],
-    "dedatarange":[{"id":"ALL","name":"全部数据"},{"id":"CUR_ORG","name":"当前部门"}],
+    "dedatarange":[{"id":"ALL","name":"全部数据"},{"id":"CURORG","name":"当前单位"},{"id":"PORG","name":"上级单位"},{"id":"SORG","name":"下级单位"},{"id":"CURORGDEPT","name":"当前部门"},{"id":"PORGDEPT","name":"上级部门"},{"id":"SORGDEPT","name":"下级部门"}],
     "deprivs":[{"id":"READ","name":"READ"},{"id":"CREATE","name":"CREATE"},{"id":"UPDATE","name":"UPDATE"},{"id":"DELETE","name":"DELETE"}]
      }
     ,
@@ -24,7 +24,7 @@
     "delogicname":"单位机构",
     "sysmoudle":{"id":"OU","name":"组织人事"},
     "dedataset":[{"id":"Default","name":"默认数据集"}],
-    "dedatarange":[{"id":"ALL","name":"全部数据"},{"id":"CUR_ORG","name":"当前部门"}],
+    "dedatarange":[{"id":"ALL","name":"全部数据"},{"id":"CURORG","name":"当前单位"},{"id":"PORG","name":"上级单位"},{"id":"SORG","name":"下级单位"},{"id":"CURORGDEPT","name":"当前部门"},{"id":"PORGDEPT","name":"上级部门"},{"id":"SORGDEPT","name":"下级部门"}],
     "deprivs":[{"id":"READ","name":"READ"},{"id":"CREATE","name":"CREATE"},{"id":"UPDATE","name":"UPDATE"},{"id":"DELETE","name":"DELETE"}]
      }
     ]

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

@@ -2,7 +2,7 @@
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
 
     <!--输出实体[IBZORG]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-ibzorg-324-1">
+    <changeSet author="a_A_5d9d78509" id="tab-ibzorg-328-1">
         <createTable tableName="IBZORG">
                 <column name="ORGID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_IBZORG_ORGID"/>
@@ -137,7 +137,7 @@
     </changeSet>
 
         <!--输出实体[IBZORG]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-ibzorg-324-4">
+    <changeSet author="a_A_5d9d78509" id="fk-ibzorg-328-4">
        <addForeignKeyConstraint baseColumnNames="PORGID" baseTableName="IBZORG" constraintName="DER1N_IBZORG_IBZORG_PORGID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGID" referencedTableName="IBZORG" validate="true"/>
     </changeSet>
         <!--输出实体[IBZEMP]外键关系 -->

ibzou-core/src/main/resources/mapper/ou/ibzorganization/IBZOrganizationMapper.xml

@@ -52,6 +52,20 @@
 			]]>
     </sql>
 
+    <!--数据查询[SelectPOrg]-->
+    <sql id="SelectPOrg" databaseId="mysql">
+       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`ENABLE`, t1.`ORGCODE`, t1.`ORGID`, t1.`ORGLEVEL`, t1.`ORGNAME`, t1.`PORGID`, t1.`SHORTNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE` FROM `IBZORG` t1  
+				 WHERE 	t1.ENABLE = 1
+			]]>
+    </sql>
+
+    <!--数据查询[SelectSOrg]-->
+    <sql id="SelectSOrg" databaseId="mysql">
+       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`ENABLE`, t1.`ORGCODE`, t1.`ORGID`, t1.`ORGLEVEL`, t1.`ORGNAME`, t1.`PORGID`, t1.`SHORTNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE` FROM `IBZORG` t1  
+				 WHERE 	t1.ENABLE = 1
+			]]>
+    </sql>
+
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
        <![CDATA[	SELECT t1.`CREATEDATE`, t1.`ENABLE`, t1.`ORGCODE`, t1.`ORGID`, t1.`ORGLEVEL`, t1.`ORGNAME`, t1.`PORGID`, t1.`SHORTNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE` FROM `IBZORG` t1  

ibzou-provider/ibzou-provider-ouapi/src/main/java/cn/ibizlab/ouapi/rest/IBZDepartmentResource.java

@@ -114,7 +114,7 @@ public class IBZDepartmentResource {
 
 
 
-    @PreAuthorize("hasPermission('','CREATE',this.getEntity())")
+    @PreAuthorize("hasPermission('','READ',this.getEntity())")
     @ApiOperation(value = "GetDraft", tags = {"IBZDepartment" },  notes = "GetDraft")
 	@RequestMapping(method = RequestMethod.GET, value = "/ibzdepartments/getdraft")
     public ResponseEntity<IBZDepartmentDTO> getDraft() {

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

@@ -168,7 +168,7 @@ public class IBZEmployeeResource {
 
 
 
-    @PreAuthorize("hasPermission('','CREATE',this.getEntity())")
+    @PreAuthorize("hasPermission('','READ',this.getEntity())")
     @ApiOperation(value = "GetDraft", tags = {"IBZEmployee" },  notes = "GetDraft")
 	@RequestMapping(method = RequestMethod.GET, value = "/ibzemployees/getdraft")
     public ResponseEntity<IBZEmployeeDTO> getDraft() {

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

@@ -155,7 +155,7 @@ public class IBZOrganizationResource {
 
 
 
-    @PreAuthorize("hasPermission('','CREATE',this.getEntity())")
+    @PreAuthorize("hasPermission('','READ',this.getEntity())")
     @ApiOperation(value = "GetDraft", tags = {"IBZOrganization" },  notes = "GetDraft")
 	@RequestMapping(method = RequestMethod.GET, value = "/ibzorganizations/getdraft")
     public ResponseEntity<IBZOrganizationDTO> getDraft() {