ibizdev提交

app_web/src/pages/workflow/wfgroup-grid-view/wfgroup-grid-view.less

@@ -17,10 +17,3 @@
         // this is less
 
 
-.view-container.degridview{
-  >.view-card.view-no-caption{
-    >.ivu-card-body{
-      height: 100%;
-    }
-  }
-}
\ No newline at end of file

app_web/src/pages/workflow/wfmember-grid-view/wfmember-grid-view.less

@@ -17,10 +17,3 @@
         // this is less
 
 
-.view-container.degridview{
-  >.view-card.view-no-caption{
-    >.ivu-card-body{
-      height: 100%;
-    }
-  }
-}
\ No newline at end of file

app_web/src/pages/workflow/wfprocess-definition-grid-view/wfprocess-definition-grid-view.less

@@ -17,10 +17,3 @@
         // this is less
 
 
-.view-container.degridview{
-  >.view-card.view-no-caption{
-    >.ivu-card-body{
-      height: 100%;
-    }
-  }
-}
\ No newline at end of file

app_web/src/pages/workflow/wfuser-grid-view/wfuser-grid-view.less

@@ -17,10 +17,3 @@
         // this is less
 
 
-.view-container.degridview{
-  >.view-card.view-no-caption{
-    >.ivu-card-body{
-      height: 100%;
-    }
-  }
-}
\ No newline at end of file

app_web/src/styles/default.less

@@ -206,6 +206,15 @@
         padding-bottom: 16px;
     }
 }
+
+.view-container.degridview, .view-container.degridview9, .view-container.dewfgridview{
+  >.view-card.view-no-caption{
+    >.ivu-card-body{
+      height: 100%;
+    }
+  }
+}
+
 /***    END:多数据视图属性布局    ***/
 
 // 看板视图，卡片模式

config.xml

@@ -37,11 +37,6 @@
 	  git clone -b master $para2 ibzwf/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibzwf/
-      mvn clean package -Pweb
-      cd ibzwf-app/ibzwf-app-web
-      mvn -Pweb docker:build
-      mvn -Pweb docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/ibzwf-app-web.yaml ibzlab-rt --with-registry-auth
       </command>
     </hudson.tasks.Shell>
   </builders>

ibzwf-app/ibzwf-app-web/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
     sleep ${IBZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzwf-app-web.jar
 
-EXPOSE 30003
+EXPOSE 8080
 
 ADD ibzwf-app-web.jar /ibzwf-app-web.jar

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

@@ -3,11 +3,9 @@ services:
   ibzwf-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzwf-app-web:latest
     ports:
-      - "30003:30003"
+      - "8080:8080"
     networks:
       - agent_network
-    environment:
-      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.180.237
     deploy:
       mode: replicated
       replicas: 1

ibzwf-app/ibzwf-app-web/src/main/resources/application-web-dev.yml

 server:
-  port: 30003
\ No newline at end of file
+  port: 8080
\ No newline at end of file

ibzwf-app/ibzwf-app-web/src/main/resources/application-web-prod.yml

 server:
-  port: 30003
+  port: 8080
 
 #zuul网关路由设置
 zuul:

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/service/impl/WFGroupServiceImpl.java

@@ -154,6 +154,13 @@ public class WFGroupServiceImpl extends ServiceImpl<WFGroupMapper, WFGroup> impl
 
 
 
+    /**
+     * 为当前实体填充父数据（外键值文本、外键值附加数据）
+     * @param et
+     */
+    private void fillParentData(WFGroup et){
+    }
+
     @Override
     public List<JSONObject> select(String sql){
         return this.baseMapper.selectBySQL(sql);

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/service/impl/WFMemberServiceImpl.java

@@ -196,6 +196,27 @@ public class WFMemberServiceImpl extends ServiceImpl<WFMemberMapper, WFMember> i
 
 
 
+    /**
+     * 为当前实体填充父数据（外键值文本、外键值附加数据）
+     * @param et
+     */
+    private void fillParentData(WFMember et){
+        //实体关系[用户组]
+        if(!ObjectUtils.isEmpty(et.getGroupid())){
+            cn.ibizlab.core.workflow.domain.WFGroup group=et.getGroup();
+            if(!ObjectUtils.isEmpty(group)){
+                et.setGroupname(group.getName());
+            }
+        }
+        //实体关系[用户]
+        if(!ObjectUtils.isEmpty(et.getUserid())){
+            cn.ibizlab.core.workflow.domain.WFUser user=et.getUser();
+            if(!ObjectUtils.isEmpty(user)){
+                et.setPersonname(user.getDisplayname());
+            }
+        }
+    }
+
     @Override
     public List<JSONObject> select(String sql){
         return this.baseMapper.selectBySQL(sql);

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/service/impl/WFProcessDefinitionServiceImpl.java

@@ -147,6 +147,13 @@ public class WFProcessDefinitionServiceImpl extends ServiceImpl<WFProcessDefinit
 
 
 
+    /**
+     * 为当前实体填充父数据（外键值文本、外键值附加数据）
+     * @param et
+     */
+    private void fillParentData(WFProcessDefinition et){
+    }
+
     @Override
     public List<JSONObject> select(String sql){
         return this.baseMapper.selectBySQL(sql);

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/service/impl/WFSystemServiceImpl.java

@@ -147,6 +147,13 @@ public class WFSystemServiceImpl extends ServiceImpl<WFSystemMapper, WFSystem> i
 
 
 
+    /**
+     * 为当前实体填充父数据（外键值文本、外键值附加数据）
+     * @param et
+     */
+    private void fillParentData(WFSystem et){
+    }
+
     @Override
     public List<JSONObject> select(String sql){
         return this.baseMapper.selectBySQL(sql);

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/service/impl/WFUserServiceImpl.java

@@ -150,6 +150,13 @@ public class WFUserServiceImpl extends ServiceImpl<WFUserMapper, WFUser> impleme
 
 
 
+    /**
+     * 为当前实体填充父数据（外键值文本、外键值附加数据）
+     * @param et
+     */
+    private void fillParentData(WFUser et){
+    }
+
     @Override
     public List<JSONObject> select(String sql){
         return this.baseMapper.selectBySQL(sql);

ibzwf-util/src/main/java/cn/ibizlab/util/job/PermissionSyncJob.java

@@ -32,7 +32,7 @@ public class PermissionSyncJob implements ApplicationRunner {
     @Value("${ibiz.enablePermissionValid:false}")
     boolean enablePermissionValid;  //是否开启权限校验
 
-    @Value("${ibiz.systemid:0A91C1B1-3B67-4EDA-9572-5DB491871FEE}")
+    @Value("${ibiz.systemid:2C40DFCD-0DF5-47BF-91A5-C45F810B0001}")
     private String systemId;
 
     @Override