jackwang 部署微服务接口

config.xml

@@ -37,11 +37,11 @@
 	  git clone -b master $para2 ibizhumanresources/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibizhumanresources/
-      mvn clean package -Ppim
-      cd humanresource-app/humanresource-app-pim
-      mvn -Ppim docker:build
-      mvn -Ppim docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/humanresource-app-pim.yaml iBizEE --with-registry-auth
+      mvn clean package -Phrapi
+      cd humanresource-provider/humanresource-provider-hrapi
+      mvn -Phrapi docker:build
+      mvn -Phrapi docker:push
+      docker -H $para1 stack deploy --compose-file=src/main/docker/humanresource-provider-hrapi.yaml iBizEE --with-registry-auth      
       </command>
     </hudson.tasks.Shell>
   </builders>

humanresource-app/humanresource-app-pim/src/main/docker/Dockerfile

@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /humanresource-app-pim.jar
 
-EXPOSE 10327
+EXPOSE 8080
 
 ADD humanresource-app-pim.jar /humanresource-app-pim.jar

humanresource-app/humanresource-app-pim/src/main/docker/humanresource-app-pim.yaml

@@ -3,25 +3,9 @@ services:
   humanresource-app-pim:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/humanresource-app-pim:latest
     ports:
-      - "10327:10327"
+      - "8080:8080"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
-      - SERVER_PORT=10327
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
-      - SPRING_REDIS_HOST=172.16.240.110
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_LAB01_e85d8801c
-      - SPRING_DATASOURCE_PASSWORD=b1@@@772
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_e85d8801c
-      - CAS=https://passport.ibizlab.cn
-      - NACOS=172.16.240.110:8848
-      - SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
-      - SEATA_ENABLED=true
     deploy:
       resources:
            limits:

humanresource-core/src/main/java/cn/ibizlab/humanresource/core/base/domain/HROMHIERARCHYPURPOSE.java

@@ -50,7 +50,7 @@ public class HROMHIERARCHYPURPOSE extends EntityMP implements Serializable {
     @JsonProperty("updatedate")
     private Timestamp updatedate;
     /**
-     * 组织层次机构目的名称
+     * 用途
      */
     @TableField(value = "omhierarchypurposename")
     @JSONField(name = "omhierarchypurposename")
@@ -65,7 +65,7 @@ public class HROMHIERARCHYPURPOSE extends EntityMP implements Serializable {
     @JsonProperty("createman")
     private String createman;
     /**
-     * 组织层次机构目的标识
+     * 组织层次机构应用标识
      */
     @DEField(isKeyField=true)
     @TableId(value= "omhierarchypurposeid",type=IdType.ASSIGN_UUID)
@@ -93,7 +93,7 @@ public class HROMHIERARCHYPURPOSE extends EntityMP implements Serializable {
 
 
     /**
-     * 设置 [组织层次机构目的名称]
+     * 设置 [用途]
      */
     public void setOmhierarchypurposename(String omhierarchypurposename){
         this.omhierarchypurposename = omhierarchypurposename ;

humanresource-core/src/main/java/cn/ibizlab/humanresource/core/base/domain/HROMHierarchy.java

@@ -97,7 +97,7 @@ public class HROMHierarchy extends EntityMP implements Serializable {
     @JsonProperty("organizationid")
     private String organizationid;
     /**
-     * 父组织层次结构标识
+     * 上次层次结构标识
      */
     @TableField(value = "pomhierarchyid")
     @JSONField(name = "pomhierarchyid")
@@ -110,6 +110,27 @@ public class HROMHierarchy extends EntityMP implements Serializable {
     @JSONField(name = "hromhierarchycatid")
     @JsonProperty("hromhierarchycatid")
     private String hromhierarchycatid;
+    /**
+     * 上级组织
+     */
+    @TableField(exist = false)
+    @JSONField(name = "pomhierarchyname")
+    @JsonProperty("pomhierarchyname")
+    private String pomhierarchyname;
+    /**
+     * 组织名称
+     */
+    @TableField(exist = false)
+    @JSONField(name = "organizationname")
+    @JsonProperty("organizationname")
+    private String organizationname;
+    /**
+     * 排序号
+     */
+    @TableField(value = "showorder")
+    @JSONField(name = "showorder")
+    @JsonProperty("showorder")
+    private BigInteger showorder;
 
     /**
      * 
@@ -133,7 +154,7 @@ public class HROMHierarchy extends EntityMP implements Serializable {
     @JsonIgnore
     @JSONField(serialize = false)
     @TableField(exist = false)
-    private cn.ibizlab.humanresource.core.base.domain.HROrganization organization;
+    private cn.ibizlab.humanresource.core.base.domain.HROrganization hrorganization;
 
 
 
@@ -154,7 +175,7 @@ public class HROMHierarchy extends EntityMP implements Serializable {
     }
 
     /**
-     * 设置 [父组织层次结构标识]
+     * 设置 [上次层次结构标识]
      */
     public void setPomhierarchyid(String pomhierarchyid){
         this.pomhierarchyid = pomhierarchyid ;
@@ -169,6 +190,14 @@ public class HROMHierarchy extends EntityMP implements Serializable {
         this.modify("hromhierarchycatid",hromhierarchycatid);
     }
 
+    /**
+     * 设置 [排序号]
+     */
+    public void setShoworder(BigInteger showorder){
+        this.showorder = showorder ;
+        this.modify("showorder",showorder);
+    }
+
 
 }
 

humanresource-core/src/main/java/cn/ibizlab/humanresource/core/base/domain/HROMHierarchyCat.java

@@ -49,7 +49,7 @@ public class HROMHierarchyCat extends EntityMP implements Serializable {
     @JsonProperty("omhierarchycatid")
     private String omhierarchycatid;
     /**
-     * 结构层次类别名称
+     * 名称
      */
     @TableField(value = "omhierarchycatname")
     @JSONField(name = "omhierarchycatname")
@@ -89,17 +89,32 @@ public class HROMHierarchyCat extends EntityMP implements Serializable {
     @JSONField(name = "updatedate" , format="yyyy-MM-dd HH:mm:ss")
     @JsonProperty("updatedate")
     private Timestamp updatedate;
+    /**
+     * 备注
+     */
+    @TableField(value = "memo")
+    @JSONField(name = "memo")
+    @JsonProperty("memo")
+    private String memo;
 
 
 
     /**
-     * 设置 [结构层次类别名称]
+     * 设置 [名称]
      */
     public void setOmhierarchycatname(String omhierarchycatname){
         this.omhierarchycatname = omhierarchycatname ;
         this.modify("omhierarchycatname",omhierarchycatname);
     }
 
+    /**
+     * 设置 [备注]
+     */
+    public void setMemo(String memo){
+        this.memo = memo ;
+        this.modify("memo",memo);
+    }
+
 
 }
 

humanresource-core/src/main/java/cn/ibizlab/humanresource/core/base/filter/HROMHIERARCHYPURPOSESearchContext.java

@@ -27,7 +27,7 @@ import cn.ibizlab.humanresource.core.base.domain.HROMHIERARCHYPURPOSE;
 @Data
 public class HROMHIERARCHYPURPOSESearchContext extends QueryWrapperContext<HROMHIERARCHYPURPOSE> {
 
-	private String n_omhierarchypurposename_like;//[组织层次机构目的名称]
+	private String n_omhierarchypurposename_like;//[用途]
 	public void setN_omhierarchypurposename_like(String n_omhierarchypurposename_like) {
         this.n_omhierarchypurposename_like = n_omhierarchypurposename_like;
         if(!ObjectUtils.isEmpty(this.n_omhierarchypurposename_like)){

humanresource-core/src/main/java/cn/ibizlab/humanresource/core/base/filter/HROMHierarchyCatSearchContext.java

@@ -27,7 +27,7 @@ import cn.ibizlab.humanresource.core.base.domain.HROMHierarchyCat;
 @Data
 public class HROMHierarchyCatSearchContext extends QueryWrapperContext<HROMHierarchyCat> {
 
-	private String n_omhierarchycatname_like;//[结构层次类别名称]
+	private String n_omhierarchycatname_like;//[名称]
 	public void setN_omhierarchycatname_like(String n_omhierarchycatname_like) {
         this.n_omhierarchycatname_like = n_omhierarchycatname_like;
         if(!ObjectUtils.isEmpty(this.n_omhierarchycatname_like)){

humanresource-core/src/main/java/cn/ibizlab/humanresource/core/base/filter/HROMHierarchySearchContext.java

@@ -41,7 +41,7 @@ public class HROMHierarchySearchContext extends QueryWrapperContext<HROMHierarch
             this.getSearchCond().eq("organizationid", n_organizationid_eq);
         }
     }
-	private String n_pomhierarchyid_eq;//[父组织层次结构标识]
+	private String n_pomhierarchyid_eq;//[上次层次结构标识]
 	public void setN_pomhierarchyid_eq(String n_pomhierarchyid_eq) {
         this.n_pomhierarchyid_eq = n_pomhierarchyid_eq;
         if(!ObjectUtils.isEmpty(this.n_pomhierarchyid_eq)){
@@ -55,6 +55,34 @@ public class HROMHierarchySearchContext extends QueryWrapperContext<HROMHierarch
             this.getSearchCond().eq("hromhierarchycatid", n_hromhierarchycatid_eq);
         }
     }
+	private String n_pomhierarchyname_eq;//[上级组织]
+	public void setN_pomhierarchyname_eq(String n_pomhierarchyname_eq) {
+        this.n_pomhierarchyname_eq = n_pomhierarchyname_eq;
+        if(!ObjectUtils.isEmpty(this.n_pomhierarchyname_eq)){
+            this.getSearchCond().eq("pomhierarchyname", n_pomhierarchyname_eq);
+        }
+    }
+	private String n_pomhierarchyname_like;//[上级组织]
+	public void setN_pomhierarchyname_like(String n_pomhierarchyname_like) {
+        this.n_pomhierarchyname_like = n_pomhierarchyname_like;
+        if(!ObjectUtils.isEmpty(this.n_pomhierarchyname_like)){
+            this.getSearchCond().like("pomhierarchyname", n_pomhierarchyname_like);
+        }
+    }
+	private String n_organizationname_eq;//[组织名称]
+	public void setN_organizationname_eq(String n_organizationname_eq) {
+        this.n_organizationname_eq = n_organizationname_eq;
+        if(!ObjectUtils.isEmpty(this.n_organizationname_eq)){
+            this.getSearchCond().eq("organizationname", n_organizationname_eq);
+        }
+    }
+	private String n_organizationname_like;//[组织名称]
+	public void setN_organizationname_like(String n_organizationname_like) {
+        this.n_organizationname_like = n_organizationname_like;
+        if(!ObjectUtils.isEmpty(this.n_organizationname_like)){
+            this.getSearchCond().like("organizationname", n_organizationname_like);
+        }
+    }
 
     /**
 	 * 启用快速搜索
@@ -64,7 +92,7 @@ public class HROMHierarchySearchContext extends QueryWrapperContext<HROMHierarch
 		 this.query=query;
 		 if(!StringUtils.isEmpty(query)){
             this.getSearchCond().and( wrapper ->
-                     wrapper.like("omhierarchyname", query)   
+                     wrapper.like("organizationname", query)   
             );
 		 }
 	}

humanresource-core/src/main/java/cn/ibizlab/humanresource/core/base/service/impl/HROMHierarchyServiceImpl.java

@@ -59,6 +59,7 @@ public class HROMHierarchyServiceImpl extends ServiceImpl<HROMHierarchyMapper, H
     @Override
     @Transactional
     public boolean create(HROMHierarchy et) {
+        fillParentData(et);
         if(!this.retBool(this.baseMapper.insert(et)))
             return false;
         CachedBeanCopier.copy(get(et.getOmhierarchyid()),et);
@@ -67,12 +68,14 @@ public class HROMHierarchyServiceImpl extends ServiceImpl<HROMHierarchyMapper, H
 
     @Override
     public void createBatch(List<HROMHierarchy> list) {
+        list.forEach(item->fillParentData(item));
         this.saveBatch(list,batchSize);
     }
 
     @Override
     @Transactional
     public boolean update(HROMHierarchy et) {
+        fillParentData(et);
         if(!update(et,(Wrapper) et.getUpdateWrapper(true).eq("omhierarchyid",et.getOmhierarchyid())))
             return false;
         CachedBeanCopier.copy(get(et.getOmhierarchyid()),et);
@@ -81,6 +84,7 @@ public class HROMHierarchyServiceImpl extends ServiceImpl<HROMHierarchyMapper, H
 
     @Override
     public void updateBatch(List<HROMHierarchy> list) {
+        list.forEach(item->fillParentData(item));
         updateBatchById(list,batchSize);
     }
 
@@ -111,6 +115,7 @@ public class HROMHierarchyServiceImpl extends ServiceImpl<HROMHierarchyMapper, H
 
     @Override
     public HROMHierarchy getDraft(HROMHierarchy et) {
+        fillParentData(et);
         return et;
     }
 
@@ -138,12 +143,14 @@ public class HROMHierarchyServiceImpl extends ServiceImpl<HROMHierarchyMapper, H
 
     @Override
     public boolean saveBatch(Collection<HROMHierarchy> list) {
+        list.forEach(item->fillParentData(item));
         saveOrUpdateBatch(list,batchSize);
         return true;
     }
 
     @Override
     public void saveBatch(List<HROMHierarchy> list) {
+        list.forEach(item->fillParentData(item));
         saveOrUpdateBatch(list,batchSize);
     }
 
@@ -190,6 +197,32 @@ public class HROMHierarchyServiceImpl extends ServiceImpl<HROMHierarchyMapper, H
 
 
 
+    /**
+     * 为当前实体填充父数据（外键值文本、外键值附加数据）
+     * @param et
+     */
+    private void fillParentData(HROMHierarchy et){
+        //实体关系[DER1N_OMHIERARCHY_OMHIERARCHY_POMHIERARCHYID]
+        if(!ObjectUtils.isEmpty(et.getPomhierarchyid())){
+            cn.ibizlab.humanresource.core.base.domain.HROMHierarchy pomhierarchy=et.getPomhierarchy();
+            if(ObjectUtils.isEmpty(pomhierarchy)){
+                cn.ibizlab.humanresource.core.base.domain.HROMHierarchy majorEntity=hromhierarchyService.get(et.getPomhierarchyid());
+                et.setPomhierarchy(majorEntity);
+                pomhierarchy=majorEntity;
+            }
+            et.setPomhierarchyname(pomhierarchy.getOmhierarchyname());
+        }
+        //实体关系[DER1N_OMHIERARCHY_ORGANIZATION_ORGANIZATIONID]
+        if(!ObjectUtils.isEmpty(et.getOrganizationid())){
+            cn.ibizlab.humanresource.core.base.domain.HROrganization hrorganization=et.getHrorganization();
+            if(ObjectUtils.isEmpty(hrorganization)){
+                cn.ibizlab.humanresource.core.base.domain.HROrganization majorEntity=hrorganizationService.get(et.getOrganizationid());
+                et.setHrorganization(majorEntity);
+                hrorganization=majorEntity;
+            }
+            et.setOrganizationname(hrorganization.getOrganizationname());
+        }
+    }
 
 
 

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

@@ -66,7 +66,7 @@
 
 
     <!--输出实体[HRLEGAL]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-hrlegal-81-4">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-hrlegal-82-4">
         <createTable tableName="LEGAL">
                 <column name="LEGALNAME" remarks="" type="VARCHAR(200)">
                 </column>
@@ -92,7 +92,7 @@
 
 
     <!--输出实体[HROMHIERARCHYPURPOSE]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-hromhierarchypurpose-8-5">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-hromhierarchypurpose-11-5">
         <createTable tableName="OMHIERARCHYPURPOSE">
                 <column name="UPDATEDATE" remarks="" type="DATETIME">
                 </column>
@@ -112,7 +112,7 @@
 
 
     <!--输出实体[HROMHIERARCHY]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-hromhierarchy-6-6">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-hromhierarchy-31-6">
         <createTable tableName="OMHIERARCHY">
                 <column name="CREATEDATE" remarks="" type="DATETIME">
                 </column>
@@ -133,12 +133,14 @@
                 </column>
                 <column name="HROMHIERARCHYCATID" remarks="" type="VARCHAR(100)">
                 </column>
+                <column name="SHOWORDER" remarks="" type="BIGINT">
+                </column>
         </createTable>
     </changeSet>
 
 
     <!--输出实体[HROMHIERARCHYCAT]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-hromhierarchycat-12-7">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-hromhierarchycat-28-7">
         <createTable tableName="OMHIERARCHYCAT">
                 <column name="OMHIERARCHYCATID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_HROMHIERARCHYCAT_OMHIERARCH"/>
@@ -153,6 +155,8 @@
                 </column>
                 <column name="UPDATEDATE" remarks="" type="DATETIME">
                 </column>
+                <column name="MEMO" remarks="" type="VARCHAR(2000)">
+                </column>
         </createTable>
     </changeSet>
 
@@ -182,7 +186,7 @@
 
 
     <!--输出实体[HROPERATIONUNIT]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-hroperationunit-51-9">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-hroperationunit-57-9">
         <createTable tableName="OPERATIONUNIT">
                 <column name="UPDATEDATE" remarks="" type="DATETIME">
                 </column>
@@ -260,7 +264,7 @@
 
 
     <!--输出实体[HRORGANIZATION]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-hrorganization-25-12">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-hrorganization-27-12">
         <createTable tableName="ORGANIZATION">
                 <column name="UPDATEMAN" remarks="" type="VARCHAR(60)">
                 </column>
@@ -301,13 +305,13 @@
         <!--输出实体[HRLEGAL]外键关系 -->
         <!--输出实体[HROMHIERARCHYPURPOSE]外键关系 -->
         <!--输出实体[HROMHIERARCHY]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hromhierarchy-6-14">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hromhierarchy-31-14">
        <addForeignKeyConstraint baseColumnNames="HROMHIERARCHYCATID" baseTableName="OMHIERARCHY" constraintName="DER1N_HROMHIERARCHY_HROMHIERAR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="OMHIERARCHYCATID" referencedTableName="OMHIERARCHYCAT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hromhierarchy-6-15">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hromhierarchy-31-15">
        <addForeignKeyConstraint baseColumnNames="POMHIERARCHYID" baseTableName="OMHIERARCHY" constraintName="DER1N_OMHIERARCHY_OMHIERARCHY_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="OMHIERARCHYID" referencedTableName="OMHIERARCHY" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hromhierarchy-6-16">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hromhierarchy-31-16">
        <addForeignKeyConstraint baseColumnNames="ORGANIZATIONID" baseTableName="OMHIERARCHY" constraintName="DER1N_OMHIERARCHY_ORGANIZATION" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGANIZATIONID" referencedTableName="ORGANIZATION" validate="true"/>
     </changeSet>
         <!--输出实体[HROMHIERARCHYCAT]外键关系 -->

humanresource-core/src/main/resources/mapper/base/hromhierarchy/HROMHierarchyMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="HROMHierarchyResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HROMHIERARCHYCATID`, t1.`OMHIERARCHYID`, t1.`OMHIERARCHYNAME`, t1.`ORGANIZATIONID`, t1.`POMHIERARCHYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `OMHIERARCHY` t1  ) t1 where omhierarchyid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HROMHIERARCHYCATID`, t1.`OMHIERARCHYID`, t1.`OMHIERARCHYNAME`, t1.`ORGANIZATIONID`, t21.`ORGANIZATIONNAME`, t1.`POMHIERARCHYID`, t11.`OMHIERARCHYNAME` AS `POMHIERARCHYNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `OMHIERARCHY` t1  LEFT JOIN OMHIERARCHY t11 ON t1.POMHIERARCHYID = t11.OMHIERARCHYID  LEFT JOIN ORGANIZATION t21 ON t1.ORGANIZATIONID = t21.ORGANIZATIONID  ) t1 where omhierarchyid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -21,7 +21,7 @@
 		<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
 		<association property="pomhierarchy" javaType="cn.ibizlab.humanresource.core.base.domain.HROMHierarchy" column="pomhierarchyid" select="cn.ibizlab.humanresource.core.base.mapper.HROMHierarchyMapper.selectById" fetchType="lazy"></association>
 		<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
-		<association property="organization" javaType="cn.ibizlab.humanresource.core.base.domain.HROrganization" column="organizationid" select="cn.ibizlab.humanresource.core.base.mapper.HROrganizationMapper.selectById" fetchType="lazy"></association>
+		<association property="hrorganization" javaType="cn.ibizlab.humanresource.core.base.domain.HROrganization" column="organizationid" select="cn.ibizlab.humanresource.core.base.mapper.HROrganizationMapper.selectById" fetchType="lazy"></association>
     </resultMap>
 
 	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_HROMHIERARCHY_HROMHIERARCHYCAT_HROMHIERARCHYCATID_ABD0C1] -->
@@ -57,12 +57,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HROMHIERARCHYCATID`, t1.`OMHIERARCHYID`, t1.`OMHIERARCHYNAME`, t1.`ORGANIZATIONID`, t1.`POMHIERARCHYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `OMHIERARCHY` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HROMHIERARCHYCATID`, t1.`OMHIERARCHYID`, t1.`OMHIERARCHYNAME`, t1.`ORGANIZATIONID`, t21.`ORGANIZATIONNAME`, t1.`POMHIERARCHYID`, t11.`OMHIERARCHYNAME` AS `POMHIERARCHYNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `OMHIERARCHY` t1  LEFT JOIN OMHIERARCHY t11 ON t1.POMHIERARCHYID = t11.OMHIERARCHYID  LEFT JOIN ORGANIZATION t21 ON t1.ORGANIZATIONID = t21.ORGANIZATIONID  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HROMHIERARCHYCATID`, t1.`OMHIERARCHYID`, t1.`OMHIERARCHYNAME`, t1.`ORGANIZATIONID`, t1.`POMHIERARCHYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `OMHIERARCHY` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HROMHIERARCHYCATID`, t1.`OMHIERARCHYID`, t1.`OMHIERARCHYNAME`, t1.`ORGANIZATIONID`, t21.`ORGANIZATIONNAME`, t1.`POMHIERARCHYID`, t11.`OMHIERARCHYNAME` AS `POMHIERARCHYNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `OMHIERARCHY` t1  LEFT JOIN OMHIERARCHY t11 ON t1.POMHIERARCHYID = t11.OMHIERARCHYID  LEFT JOIN ORGANIZATION t21 ON t1.ORGANIZATIONID = t21.ORGANIZATIONID  
 			]]>
     </sql>
 </mapper>

humanresource-core/src/main/resources/mapper/base/hromhierarchycat/HROMHierarchyCatMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="HROMHierarchyCatResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`OMHIERARCHYCATID`, t1.`OMHIERARCHYCATNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `OMHIERARCHYCAT` t1  ) t1 where omhierarchycatid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`MEMO`, t1.`OMHIERARCHYCATID`, t1.`OMHIERARCHYCATNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `OMHIERARCHYCAT` t1  ) t1 where omhierarchycatid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -27,12 +27,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`OMHIERARCHYCATID`, t1.`OMHIERARCHYCATNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `OMHIERARCHYCAT` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`MEMO`, t1.`OMHIERARCHYCATID`, t1.`OMHIERARCHYCATNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `OMHIERARCHYCAT` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`OMHIERARCHYCATID`, t1.`OMHIERARCHYCATNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `OMHIERARCHYCAT` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`MEMO`, t1.`OMHIERARCHYCATID`, t1.`OMHIERARCHYCATNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `OMHIERARCHYCAT` t1  
 			]]>
     </sql>
 </mapper>

humanresource-core/src/main/resources/permission/systemResource.json

@@ -89,7 +89,7 @@
             {
                "appid":"PIM",
                "appname":"基础管理",
-               "appmenu":[{"menuid":"PIM", "menuname":"PIM", "menuitem":[{ "id":"user_menus" , "name":"用户菜单" , "items":[{ "id":"menuitem3" , "name":"设置" }]},{ "id":"top_menus" , "name":"顶部菜单" , "items":[{ "id":"menuitem1" , "name":"菜单项" }]},{ "id":"left_exp" , "name":"左侧菜单" , "items":[{ "id":"menuitem5" , "name":"人员" , "items":[{ "id":"menuitem15" , "name":"员工信息" }]},{ "id":"menuitem2" , "name":"组织" , "items":[{ "id":"menuitem4" , "name":"法人" },{ "id":"menuitem6" , "name":"运营单位" },{ "id":"menuitem7" , "name":"组织层次结构" },{ "id":"menuitem8" , "name":"组织层次结构应用" },{ "id":"menuitem9" , "name":"所有组织" },{ "id":"menuitem10" , "name":"职位" , "items":[{ "id":"menuitem11" , "name":"有效职位" },{ "id":"menuitem12" , "name":"空缺职位" },{ "id":"menuitem13" , "name":"所有职位" },{ "id":"menuitem14" , "name":"无效职位" }]}]}]},{ "id":"bottom_exp" , "name":"底部内容" },{ "id":"footer_left" , "name":"底部左侧" },{ "id":"footer_center" , "name":"底部中间" },{ "id":"footer_right" , "name":"底部右侧" }] }]
+               "appmenu":[{"menuid":"PIM", "menuname":"PIM", "menuitem":[{ "id":"user_menus" , "name":"用户菜单" , "items":[{ "id":"menuitem3" , "name":"设置" }]},{ "id":"top_menus" , "name":"顶部菜单" , "items":[{ "id":"menuitem1" , "name":"菜单项" }]},{ "id":"left_exp" , "name":"左侧菜单" , "items":[{ "id":"menuitem5" , "name":"人员" , "items":[{ "id":"menuitem15" , "name":"员工信息" }]},{ "id":"menuitem2" , "name":"组织" , "items":[{ "id":"menuitem4" , "name":"法人" },{ "id":"menuitem6" , "name":"运营单位" },{ "id":"menuitem7" , "name":"组织层次结构" },{ "id":"menuitem9" , "name":"所有组织" },{ "id":"menuitem10" , "name":"职位" , "items":[{ "id":"menuitem11" , "name":"有效职位" },{ "id":"menuitem12" , "name":"空缺职位" },{ "id":"menuitem13" , "name":"所有职位" },{ "id":"menuitem14" , "name":"无效职位" }]}]}]},{ "id":"bottom_exp" , "name":"底部内容" },{ "id":"footer_left" , "name":"底部左侧" },{ "id":"footer_center" , "name":"底部中间" },{ "id":"footer_right" , "name":"底部右侧" }] }]
             }
             ]
     }

humanresource-provider/humanresource-provider-hrapi/src/main/docker/Dockerfile

@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /humanresource-provider-hrapi.jar
 
-EXPOSE 8081
+EXPOSE 10317
 
 ADD humanresource-provider-hrapi.jar /humanresource-provider-hrapi.jar

humanresource-provider/humanresource-provider-hrapi/src/main/docker/humanresource-provider-hrapi.yaml

@@ -3,9 +3,25 @@ services:
   humanresource-provider-hrapi:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/humanresource-provider-hrapi:latest
     ports:
-      - "8081:8081"
+      - "10317:10317"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
+      - SERVER_PORT=10317
+      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
+      - SPRING_REDIS_HOST=172.16.240.110
+      - SPRING_REDIS_PORT=6379
+      - SPRING_REDIS_DATABASE=0
+      - SPRING_DATASOURCE_USERNAME=a_LAB01_e85d8801c
+      - SPRING_DATASOURCE_PASSWORD=b1@@@772
+      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
+      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
+      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_e85d8801c
+      - CAS=https://passport.ibizlab.cn
+      - NACOS=172.16.240.110:8848
+      - SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
+      - SEATA_ENABLED=true
     deploy:
       resources:
            limits:

humanresource-provider/humanresource-provider-hrapi/src/main/java/cn/ibizlab/humanresource/hrapi/dto/HROMHierarchyCatDTO.java

@@ -73,6 +73,14 @@ public class HROMHierarchyCatDTO extends DTOBase implements Serializable {
     @JsonProperty("updatedate")
     private Timestamp updatedate;
 
+    /**
+     * 属性 [MEMO]
+     *
+     */
+    @JSONField(name = "memo")
+    @JsonProperty("memo")
+    private String memo;
+
 
     /**
      * 设置 [OMHIERARCHYCATNAME]
@@ -82,6 +90,14 @@ public class HROMHierarchyCatDTO extends DTOBase implements Serializable {
         this.modify("omhierarchycatname",omhierarchycatname);
     }
 
+    /**
+     * 设置 [MEMO]
+     */
+    public void setMemo(String  memo){
+        this.memo = memo ;
+        this.modify("memo",memo);
+    }
+
 
 }
 

humanresource-provider/humanresource-provider-hrapi/src/main/java/cn/ibizlab/humanresource/hrapi/dto/HROMHierarchyDTO.java

@@ -97,6 +97,30 @@ public class HROMHierarchyDTO extends DTOBase implements Serializable {
     @JsonProperty("hromhierarchycatid")
     private String hromhierarchycatid;
 
+    /**
+     * 属性 [POMHIERARCHYNAME]
+     *
+     */
+    @JSONField(name = "pomhierarchyname")
+    @JsonProperty("pomhierarchyname")
+    private String pomhierarchyname;
+
+    /**
+     * 属性 [ORGANIZATIONNAME]
+     *
+     */
+    @JSONField(name = "organizationname")
+    @JsonProperty("organizationname")
+    private String organizationname;
+
+    /**
+     * 属性 [SHOWORDER]
+     *
+     */
+    @JSONField(name = "showorder")
+    @JsonProperty("showorder")
+    private BigInteger showorder;
+
 
     /**
      * 设置 [OMHIERARCHYNAME]
@@ -130,6 +154,14 @@ public class HROMHierarchyDTO extends DTOBase implements Serializable {
         this.modify("hromhierarchycatid",hromhierarchycatid);
     }
 
+    /**
+     * 设置 [SHOWORDER]
+     */
+    public void setShoworder(BigInteger  showorder){
+        this.showorder = showorder ;
+        this.modify("showorder",showorder);
+    }
+
 
 }