ibiz4j 发布系统代码

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

@@ -1412,6 +1412,14 @@ export default class MainBase extends Vue implements ControlInterface {
         }
 
 
+        if (Object.is(name, '') || Object.is(name, 'pdeptcheck')) {
+            let ret = false;
+            const _pdeptcheck = this.data.pdeptcheck;
+            if (this.$verify.testCond(_pdeptcheck, 'ISNULL', '')) {
+                ret = true;
+            }
+            this.detailsModel.mdeptname.setDisabled(!ret);
+        }
 
 
 

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

@@ -439,14 +439,14 @@ export default class MainBase extends Vue implements ControlInterface {
         postcode: [
             { type: 'string', message: '岗位编码 值必须为字符串类型', trigger: 'change' },
             { type: 'string', message: '岗位编码 值必须为字符串类型', trigger: 'blur' },
-            { required: false, type: 'string', message: '岗位编码 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '岗位编码 值不能为空', trigger: 'blur' },
+            { required: true, type: 'string', message: '岗位编码 值不能为空', trigger: 'change' },
+            { required: true, type: 'string', message: '岗位编码 值不能为空', trigger: 'blur' },
         ],
         postname: [
             { type: 'string', message: '岗位名称 值必须为字符串类型', trigger: 'change' },
             { type: 'string', message: '岗位名称 值必须为字符串类型', trigger: 'blur' },
-            { required: false, type: 'string', message: '岗位名称 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '岗位名称 值不能为空', trigger: 'blur' },
+            { required: true, type: 'string', message: '岗位名称 值不能为空', trigger: 'change' },
+            { required: true, type: 'string', message: '岗位名称 值不能为空', trigger: 'blur' },
         ],
         domains: [
             { type: 'string', message: '区属 值必须为字符串类型', trigger: 'change' },

app_Web/src/widgets/ibzteam-member/main-form/main-form-base.vue

@@ -476,8 +476,8 @@ export default class MainBase extends Vue implements ControlInterface {
         personname: [
             { type: 'string', message: '姓名 值必须为字符串类型', trigger: 'change' },
             { type: 'string', message: '姓名 值必须为字符串类型', trigger: 'blur' },
-            { required: false, type: 'string', message: '姓名 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '姓名 值不能为空', trigger: 'blur' },
+            { required: true, type: 'string', message: '姓名 值不能为空', trigger: 'change' },
+            { required: true, type: 'string', message: '姓名 值不能为空', trigger: 'blur' },
         ],
         postname: [
             { type: 'string', message: '岗位 值必须为字符串类型', trigger: 'change' },

app_Web/src/widgets/ibzteam-member/main-grid/main-grid-base.vue

@@ -720,8 +720,8 @@ export default class MainBase extends Vue implements ControlInterface {
             { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '用户标识 值不能为空', trigger: 'blur' },
         ],
         personname: [
-             { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '姓名 值不能为空', trigger: 'change' },
-            { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '姓名 值不能为空', trigger: 'blur' },
+             { required: true, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '姓名 值不能为空', trigger: 'change' },
+            { required: true, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '姓名 值不能为空', trigger: 'blur' },
         ],
         srfkey: [
              { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '组成员标识 值不能为空', trigger: 'change' },

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

@@ -465,8 +465,8 @@ export default class MainBase extends Vue implements ControlInterface {
         teamname: [
             { type: 'string', message: '组名称 值必须为字符串类型', trigger: 'change' },
             { type: 'string', message: '组名称 值必须为字符串类型', trigger: 'blur' },
-            { required: false, type: 'string', message: '组名称 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '组名称 值不能为空', trigger: 'blur' },
+            { required: true, type: 'string', message: '组名称 值不能为空', trigger: 'change' },
+            { required: true, type: 'string', message: '组名称 值不能为空', trigger: 'blur' },
         ],
         memo: [
             { type: 'string', message: '备注 值必须为字符串类型', trigger: 'change' },

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

@@ -4,129 +4,129 @@ server:
 #zuul网关路由设置
 zuul:
   routes:
-      ibzorg:
-        path: /ibzorgs/**
-        serviceId: ibzou-api
+      dict_catalog:
+        path: /dict_catalogs/**
+        serviceId: ibzdict-api
         stripPrefix: false
-      wf_instance:
-        path: /wf_instances/**
-        serviceId: ibzwf-api
+      dict_option:
+        path: /dict_options/**
+        serviceId: ibzdict-api
         stripPrefix: false
-      wf_model:
-        path: /wf_models/**
-        serviceId: ibzwf-api
+      ibzdept:
+        path: /ibzdepts/**
+        serviceId: ibzou-api
         stripPrefix: false
-      jobs_registry:
-        path: /jobs_registries/**
-        serviceId: ibztask-api
+      ibzdeptmember:
+        path: /ibzdeptmembers/**
+        serviceId: ibzou-api
         stripPrefix: false
-      wf_task:
-        path: /wf_tasks/**
-        serviceId: ibzwf-api
+      ibzorg:
+        path: /ibzorgs/**
+        serviceId: ibzou-api
         stripPrefix: false
-      wf_group_member:
-        path: /wf_group_members/**
-        serviceId: ibzwf-api
+      ibzpost:
+        path: /ibzposts/**
+        serviceId: ibzou-api
         stripPrefix: false
-      dict_catalog:
-        path: /dict_catalogs/**
-        serviceId: ibzdict-api
+      ibzteam:
+        path: /ibzteams/**
+        serviceId: ibzou-api
         stripPrefix: false
       ibzteammember:
         path: /ibzteammembers/**
         serviceId: ibzou-api
         stripPrefix: false
-      sys_authlog:
-        path: /sys_authlogs/**
-        serviceId: ibzuaa-api
-        stripPrefix: false
       jobs_info:
         path: /jobs_infos/**
         serviceId: ibztask-api
         stripPrefix: false
-      wf_definition_node:
-        path: /wf_definition_nodes/**
-        serviceId: ibzwf-api
-        stripPrefix: false
-      sys_user:
-        path: /sys_users/**
-        serviceId: ibzuaa-api
+      jobs_lock:
+        path: /jobs_locks/**
+        serviceId: ibztask-api
         stripPrefix: false
-      sys_app:
-        path: /sys_apps/**
-        serviceId: ibzuaa-api
+      jobs_log:
+        path: /jobs_logs/**
+        serviceId: ibztask-api
         stripPrefix: false
-      wf_group:
-        path: /wf_groups/**
-        serviceId: ibzwf-api
+      jobs_registry:
+        path: /jobs_registries/**
+        serviceId: ibztask-api
         stripPrefix: false
       sd_file:
         path: /sd_files/**
         serviceId: ibzdisk-api
         stripPrefix: false
-      sys_role:
-        path: /sys_roles/**
+      sys_app:
+        path: /sys_apps/**
         serviceId: ibzuaa-api
         stripPrefix: false
-      jobs_lock:
-        path: /jobs_locks/**
-        serviceId: ibztask-api
+      sys_authlog:
+        path: /sys_authlogs/**
+        serviceId: ibzuaa-api
         stripPrefix: false
       sys_pssystem:
         path: /sys_pssystems/**
         serviceId: ibzuaa-api
         stripPrefix: false
-      ibzdeptmember:
-        path: /ibzdeptmembers/**
-        serviceId: ibzou-api
+      sys_permission:
+        path: /sys_permissions/**
+        serviceId: ibzuaa-api
         stripPrefix: false
-      jobs_log:
-        path: /jobs_logs/**
-        serviceId: ibztask-api
+      sys_role:
+        path: /sys_roles/**
+        serviceId: ibzuaa-api
         stripPrefix: false
-      ibzdept:
-        path: /ibzdepts/**
-        serviceId: ibzou-api
+      sys_role_permission:
+        path: /sys_role_permissions/**
+        serviceId: ibzuaa-api
         stripPrefix: false
-      wf_pssystem:
-        path: /wf_pssystems/**
+      sys_user:
+        path: /sys_users/**
+        serviceId: ibzuaa-api
+        stripPrefix: false
+      sys_user_role:
+        path: /sys_user_roles/**
+        serviceId: ibzuaa-api
+        stripPrefix: false
+      wf_group:
+        path: /wf_groups/**
         serviceId: ibzwf-api
         stripPrefix: false
-      ibzpost:
-        path: /ibzposts/**
-        serviceId: ibzou-api
+      wf_group_member:
+        path: /wf_group_members/**
+        serviceId: ibzwf-api
         stripPrefix: false
-      dict_option:
-        path: /dict_options/**
-        serviceId: ibzdict-api
+      wf_definition:
+        path: /wf_definitions/**
+        serviceId: ibzwf-api
         stripPrefix: false
-      wf_task_way:
-        path: /wf_task_ways/**
+      wf_instance:
+        path: /wf_instances/**
         serviceId: ibzwf-api
         stripPrefix: false
-      sys_role_permission:
-        path: /sys_role_permissions/**
-        serviceId: ibzuaa-api
+      wf_definition_node:
+        path: /wf_definition_nodes/**
+        serviceId: ibzwf-api
         stripPrefix: false
-      wf_user:
-        path: /wf_users/**
+      wf_model:
+        path: /wf_models/**
         serviceId: ibzwf-api
         stripPrefix: false
-      ibzteam:
-        path: /ibzteams/**
-        serviceId: ibzou-api
+      wf_pssystem:
+        path: /wf_pssystems/**
+        serviceId: ibzwf-api
         stripPrefix: false
-      sys_user_role:
-        path: /sys_user_roles/**
-        serviceId: ibzuaa-api
+      wf_task:
+        path: /wf_tasks/**
+        serviceId: ibzwf-api
         stripPrefix: false
-      wf_definition:
-        path: /wf_definitions/**
+      wf_task_way:
+        path: /wf_task_ways/**
         serviceId: ibzwf-api
         stripPrefix: false
-      sys_permission:
-        path: /sys_permissions/**
-        serviceId: ibzuaa-api
+      wf_user:
+        path: /wf_users/**
+        serviceId: ibzwf-api
         stripPrefix: false
       loginv7:
         path: /v7/login

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

@@ -33,7 +33,7 @@ public class IBZPost extends EntityClient implements Serializable {
     /**
      * 岗位标识
      */
-    @DEField(isKeyField=true)
+    @DEField(defaultValue = "postcode" , defaultValueType = DEFieldDefaultValueType.PARAM , isKeyField=true)
     @JSONField(name = "postid")
     @JsonProperty("postid")
     private String postid;

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

@@ -11,30 +11,8 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
     <!--输出实体[IBZEMP]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-ibzemp-5-1">
+    <changeSet author="a_A_5d9d78509" id="tab-ibzemp-6-1">
         <createTable tableName="IBZEMP">
                 <column name="USERID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_IBZEMP_USERID"/>
@@ -123,6 +101,28 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -145,13 +145,13 @@
 
 
         <!--输出实体[IBZEMP]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-ibzemp-5-2">
+    <changeSet author="a_A_5d9d78509" id="fk-ibzemp-6-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-5-3">
+    <changeSet author="a_A_5d9d78509" id="fk-ibzemp-6-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-5-4">
+    <changeSet author="a_A_5d9d78509" id="fk-ibzemp-6-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>