ibiz4j 发布系统代码

app_web/src/widgets/control-service.ts

@@ -293,13 +293,15 @@ export default class ControlService {
                 if (codelist) {
                     resolve([...JSON.parse(JSON.stringify(codelist.items))]);
                 } else {
-                    console.log(`<#noparse>----${codeListObject.tag}----代码表不存在</#noparse>`);
+                    resolve([]);
+                    console.log(`----${codeListObject.tag}----代码表不存在`);
                 }
             }else if(codeListObject.tag && Object.is(codeListObject.codelistType,"DYNAMIC")){
                 this.codeListService.getItems(codeListObject.tag).then((res:any) => {
                     resolve(res);
                 }).catch((error:any) => {
-                    console.log(`<#noparse>----${codeListObject.tag}----代码表不存在</#noparse>`);
+                    resolve([]);
+                    console.log(`----${codeListObject.tag}----代码表不存在`);
                 });
             }
         })

ibzou-core/src/main/java/cn/ibizlab/core/ou/mapper/IBZDepartmentMapper.java

@@ -30,6 +30,7 @@ public interface IBZDepartmentMapper extends BaseMapper<IBZDepartment>{
     @Override
     @CacheEvict( value="ibzdepartment",key = "'row:'+#p0.deptid")
     int updateById(@Param(Constants.ENTITY) IBZDepartment entity);
+    @Override
     @CacheEvict(value="ibzdepartment",key = "'row:'+#p0.deptid")
     int update(@Param(Constants.ENTITY) IBZDepartment entity, @Param("ew") Wrapper<IBZDepartment> updateWrapper);
     @Override

ibzou-core/src/main/java/cn/ibizlab/core/ou/mapper/IBZDeptMemberMapper.java

@@ -26,6 +26,7 @@ public interface IBZDeptMemberMapper extends BaseMapper<IBZDeptMember>{
     int insert(IBZDeptMember entity);
     @Override
     int updateById(@Param(Constants.ENTITY) IBZDeptMember entity);
+    @Override
     int update(@Param(Constants.ENTITY) IBZDeptMember entity, @Param("ew") Wrapper<IBZDeptMember> updateWrapper);
     @Override
     int deleteById(Serializable id);

ibzou-core/src/main/java/cn/ibizlab/core/ou/mapper/IBZEmployeeMapper.java

@@ -29,6 +29,7 @@ public interface IBZEmployeeMapper extends BaseMapper<IBZEmployee>{
     @Override
     @CacheEvict( value="ibzemployee",key = "'row:'+#p0.userid")
     int updateById(@Param(Constants.ENTITY) IBZEmployee entity);
+    @Override
     @CacheEvict(value="ibzemployee",key = "'row:'+#p0.userid")
     int update(@Param(Constants.ENTITY) IBZEmployee entity, @Param("ew") Wrapper<IBZEmployee> updateWrapper);
     @Override

ibzou-core/src/main/java/cn/ibizlab/core/ou/mapper/IBZOrganizationMapper.java

@@ -31,6 +31,7 @@ public interface IBZOrganizationMapper extends BaseMapper<IBZOrganization>{
     @Override
     @CacheEvict( value="ibzorganization",key = "'row:'+#p0.orgid")
     int updateById(@Param(Constants.ENTITY) IBZOrganization entity);
+    @Override
     @CacheEvict(value="ibzorganization",key = "'row:'+#p0.orgid")
     int update(@Param(Constants.ENTITY) IBZOrganization entity, @Param("ew") Wrapper<IBZOrganization> updateWrapper);
     @Override

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

@@ -28,7 +28,7 @@
         </createTable>
     </changeSet>
     <!--输出实体[IBZEMP]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-ibzemp-616-2">
+    <changeSet author="a_A_5d9d78509" id="tab-ibzemp-618-2">
         <createTable tableName="IBZEMP">
                 <column name="USERID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_IBZEMP_USERID"/>
@@ -106,7 +106,7 @@
         </createTable>
     </changeSet>
     <!--输出实体[IBZDEPTMEMBER]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-ibzdeptmember-25-3">
+    <changeSet author="a_A_5d9d78509" id="tab-ibzdeptmember-27-3">
         <createTable tableName="IBZDEPTMEMBER">
                 <column name="MEMBERID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_IBZDEPTMEMBER_MEMBERID"/>
@@ -118,7 +118,7 @@
         </createTable>
     </changeSet>
     <!--输出实体[IBZDEPT]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-ibzdept-542-4">
+    <changeSet author="a_A_5d9d78509" id="tab-ibzdept-543-4">
         <createTable tableName="IBZDEPT">
                 <column name="DEPTID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_IBZDEPT_DEPTID"/>
@@ -157,24 +157,24 @@
        <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]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-ibzemp-616-6">
+    <changeSet author="a_A_5d9d78509" id="fk-ibzemp-618-6">
        <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-616-7">
+    <changeSet author="a_A_5d9d78509" id="fk-ibzemp-618-7">
        <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>
         <!--输出实体[IBZDEPTMEMBER]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-ibzdeptmember-25-8">
+    <changeSet author="a_A_5d9d78509" id="fk-ibzdeptmember-27-8">
        <addForeignKeyConstraint baseColumnNames="DEPTID" baseTableName="IBZDEPTMEMBER" constraintName="DER1N_IBZDEPTMEMBER_IBZDEPT_DE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="DEPTID" referencedTableName="IBZDEPT" validate="true"/>
     </changeSet>
-    <changeSet author="a_A_5d9d78509" id="fk-ibzdeptmember-25-9">
+    <changeSet author="a_A_5d9d78509" id="fk-ibzdeptmember-27-9">
        <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-542-10">
+    <changeSet author="a_A_5d9d78509" id="fk-ibzdept-543-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-542-11">
+    <changeSet author="a_A_5d9d78509" id="fk-ibzdept-543-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-core/src/main/resources/rules/IBZEmployeesaveDeptMemberRule.drl

@@ -16,7 +16,7 @@ rule "deaction1"
 ruleflow-group "ibzemployeesavedeptmemberdeaction1"
     when
     then
-    ibzdeptmemberservice.save(ibzemployeesavedeptmemberdefault);
+    ibzdeptmemberservice.save(ibzemployeesavedeptmembermember);
     update(ibzemployeesavedeptmemberdefault);//更新fact中变量值
     update(ibzemployeesavedeptmembermember);//更新fact中变量值
     end