diff --git a/esua-epdc/doc/branch/dev_1118/db/esua_epdc_events.sql b/esua-epdc/doc/branch/dev_1118/db/esua_epdc_events.sql
index f8f9c9b28..b85157381 100644
--- a/esua-epdc/doc/branch/dev_1118/db/esua_epdc_events.sql
+++ b/esua-epdc/doc/branch/dev_1118/db/esua_epdc_events.sql
@@ -21,4 +21,90 @@ CREATE TABLE epdc_item_information(
     PRIMARY KEY (ID)
 ) COMMENT = ' ';;
 
-------------------------------------------2019-11-20-----------------------------------------------
\ No newline at end of file
+------------------------------------------2019-11-20-----------------------------------------------
+------------------------------------------2019-11-26-----------------------------------------------
+
+-- 新增分类管理表
+CREATE TABLE `epdc_category` (
+  `id` bigint(32) NOT NULL COMMENT 'id',
+  `pid` bigint(32) DEFAULT NULL COMMENT '上级分类ID',
+  `pids` varchar(500) DEFAULT NULL COMMENT '所有上级分类ID，用逗号分开',
+  `category_name` varchar(50) DEFAULT NULL COMMENT '分类名称',
+  `category_code` varchar(255) DEFAULT NULL COMMENT '分类编码',
+  `category_type` varchar(50) DEFAULT NULL COMMENT '分类类别',
+  `sort` int(10) unsigned DEFAULT NULL COMMENT '排序',
+  `del_flag` tinyint(4) unsigned DEFAULT NULL COMMENT '删除标识  0：未删除    1：删除',
+  `creator` bigint(20) DEFAULT NULL COMMENT '创建者',
+  `create_date` datetime DEFAULT NULL COMMENT '创建时间',
+  `updater` bigint(20) DEFAULT NULL COMMENT '更新者',
+  `update_date` datetime DEFAULT NULL COMMENT '更新时间',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `category_code_unique` (`category_code`) USING BTREE COMMENT '类别编码唯一',
+  KEY `idx_pid` (`pid`),
+  KEY `idx_del_flag` (`del_flag`),
+  KEY `idx_create_date` (`create_date`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='分类管理';
+
+-- 事件表新增分类编码、一级分类编码字段
+ALTER TABLE epdc_events ADD CATEGORY_CODE varchar(50) NULL COMMENT '分类编码';
+ALTER TABLE epdc_events ADD FIRST_CATEGORY_CODE varchar(50) NULL COMMENT '一级分类编码';
+ALTER TABLE epdc_events ADD CATEGORY_FULL_NAME varchar(256) NULL COMMENT '分类全称';
+ALTER TABLE epdc_events ADD ALL_DEPT_IDS varchar(512) NULL COMMENT '所有部门ID';
+ALTER TABLE epdc_events ADD ALL_DEPT_NAMES varchar(512) NULL COMMENT '所有部门名称';
+
+-- 议题表新增分类编码、一级分类编码字段
+ALTER TABLE epdc_issue ADD CATEGORY_CODE varchar(50) NULL COMMENT '分类编码';
+ALTER TABLE epdc_issue ADD FIRST_CATEGORY_CODE varchar(50) NULL COMMENT '一级分类编码';
+ALTER TABLE epdc_issue ADD CATEGORY_FULL_NAME varchar(256) NULL COMMENT '分类全称';
+ALTER TABLE epdc_issue ADD ALL_DEPT_IDS varchar(512) NULL COMMENT '所有部门ID';
+ALTER TABLE epdc_issue ADD ALL_DEPT_NAMES varchar(512) NULL COMMENT '所有部门名称';
+
+-- 项目表新增分类编码、一级分类编码字段
+ALTER TABLE epdc_item ADD CATEGORY_CODE varchar(50) NULL COMMENT '分类编码';
+ALTER TABLE epdc_item ADD FIRST_CATEGORY_CODE varchar(50) NULL COMMENT '一级分类编码';
+ALTER TABLE epdc_item ADD CATEGORY_FULL_NAME varchar(256) NULL COMMENT '分类全称';
+ALTER TABLE epdc_item ADD ALL_DEPT_IDS varchar(512) NULL COMMENT '所有部门ID';
+ALTER TABLE epdc_item ADD ALL_DEPT_NAMES varchar(512) NULL COMMENT '所有部门名称';
+
+-- 议题处理进度表增加操作人联系方式字段
+ALTER TABLE epdc_issue_handle ADD MOBILE varchar(20) NULL COMMENT '操作人联系方式';
+
+------------------------------------------2019-11-26-----------------------------------------------
+
+------------------------------------------2019-11-27------------------------------------------------
+DROP TABLE esua_epdc_events.epdc_dept_kpi_config;
+DROP TABLE esua_epdc_events.epdc_dept_respond_log;
+DROP TABLE esua_epdc_events.epdc_dept_respond_time_config;
+DROP TABLE esua_epdc_events.epdc_grid_work_score;
+DROP TABLE esua_epdc_events.pdman_db_version;
+
+ALTER TABLE esua_epdc_events.epdc_events DROP COLUMN `AREA`;
+ALTER TABLE esua_epdc_events.epdc_events DROP COLUMN `AREA_ID`;
+ALTER TABLE esua_epdc_events.epdc_events DROP COLUMN `STREET`;
+ALTER TABLE esua_epdc_events.epdc_events DROP COLUMN `STREET_ID`;
+ALTER TABLE esua_epdc_events.epdc_events DROP COLUMN `COMMUNITY`;
+ALTER TABLE esua_epdc_events.epdc_events DROP COLUMN `COMMUNITY_ID`;
+
+ALTER TABLE esua_epdc_events.epdc_events ADD PARENT_DEPT_IDS VARCHAR(1024) NULL COMMENT '父所有部门';
+ALTER TABLE esua_epdc_events.epdc_events ADD PARENT_DEPT_NAMES VARCHAR(1024) NULL COMMENT '父所有部门';
+
+ALTER TABLE esua_epdc_events.epdc_issue DROP COLUMN `AREA`;
+ALTER TABLE esua_epdc_events.epdc_issue DROP COLUMN `AREA_ID`;
+ALTER TABLE esua_epdc_events.epdc_issue DROP COLUMN `STREET`;
+ALTER TABLE esua_epdc_events.epdc_issue DROP COLUMN `STREET_ID`;
+ALTER TABLE esua_epdc_events.epdc_issue DROP COLUMN `COMMUNITY`;
+ALTER TABLE esua_epdc_events.epdc_issue DROP COLUMN `COMMUNITY_ID`;
+
+ALTER TABLE esua_epdc_events.epdc_issue ADD PARENT_DEPT_IDS VARCHAR(1024) NULL COMMENT '父所有部门';
+ALTER TABLE esua_epdc_events.epdc_issue ADD PARENT_DEPT_NAMES VARCHAR(1024) NULL COMMENT '父所有部门';
+
+ALTER TABLE esua_epdc_events.epdc_item DROP COLUMN `AREA`;
+ALTER TABLE esua_epdc_events.epdc_item DROP COLUMN `AREA_ID`;
+ALTER TABLE esua_epdc_events.epdc_item DROP COLUMN `STREET`;
+ALTER TABLE esua_epdc_events.epdc_item DROP COLUMN `STREET_ID`;
+ALTER TABLE esua_epdc_events.epdc_item DROP COLUMN `COMMUNITY`;
+ALTER TABLE esua_epdc_events.epdc_item DROP COLUMN `COMMUNITY_ID`;
+
+ALTER TABLE esua_epdc_events.epdc_item ADD PARENT_DEPT_IDS VARCHAR(1024) NULL COMMENT '父所有部门';
+ALTER TABLE esua_epdc_events.epdc_item ADD PARENT_DEPT_NAMES VARCHAR(1024) NULL COMMENT '父所有部门';
+------------------------------------------2019-11-27------------------------------------------------
diff --git a/esua-epdc/doc/branch/dev_1118/db/esua_epdc_news.sql b/esua-epdc/doc/branch/dev_1118/db/esua_epdc_news.sql
new file mode 100644
index 000000000..dc8f34470
--- /dev/null
+++ b/esua-epdc/doc/branch/dev_1118/db/esua_epdc_news.sql
@@ -0,0 +1,43 @@
+------------------------------------------2019-11-27-----------------------------------------------
+ALTER TABLE esua_epdc_news.epdc_banner DROP COLUMN `STREET`;
+ALTER TABLE esua_epdc_news.epdc_banner DROP COLUMN `STREET_ID`;
+ALTER TABLE esua_epdc_news.epdc_banner DROP COLUMN `COMMUNITY`;
+ALTER TABLE esua_epdc_news.epdc_banner DROP COLUMN `COMMUNITY_ID`;
+ALTER TABLE esua_epdc_news.epdc_banner DROP COLUMN `GRID`;
+ALTER TABLE esua_epdc_news.epdc_banner DROP COLUMN `GRID_ID`;
+ALTER TABLE esua_epdc_news.epdc_banner ADD PARENT_DEPT_IDS VARCHAR(1024) NULL COMMENT '父所有部门';
+ALTER TABLE esua_epdc_news.epdc_banner ADD PARENT_DEPT_NAMES VARCHAR(1024) NULL COMMENT '父所有部门';
+ALTER TABLE esua_epdc_news.epdc_banner ADD ALL_DEPT_IDS varchar(512) NULL COMMENT '所有部门ID';
+ALTER TABLE esua_epdc_news.epdc_banner ADD ALL_DEPT_NAMES varchar(512) NULL COMMENT '所有部门名称';
+
+
+ALTER TABLE esua_epdc_news.epdc_news DROP COLUMN `STREET`;
+ALTER TABLE esua_epdc_news.epdc_news DROP COLUMN `STREET_ID`;
+ALTER TABLE esua_epdc_news.epdc_news DROP COLUMN `COMMUNITY`;
+ALTER TABLE esua_epdc_news.epdc_news DROP COLUMN `COMMUNITY_ID`;
+ALTER TABLE esua_epdc_news.epdc_news DROP COLUMN `GRID`;
+ALTER TABLE esua_epdc_news.epdc_news DROP COLUMN `GRID_ID`;
+ALTER TABLE esua_epdc_news.epdc_news ADD PARENT_DEPT_IDS VARCHAR(1024) NULL COMMENT '父所有部门';
+ALTER TABLE esua_epdc_news.epdc_news ADD PARENT_DEPT_NAMES VARCHAR(1024) NULL COMMENT '父所有部门';
+ALTER TABLE esua_epdc_news.epdc_news ADD ALL_DEPT_IDS varchar(512) NULL COMMENT '所有部门ID';
+ALTER TABLE esua_epdc_news.epdc_news ADD ALL_DEPT_NAMES varchar(512) NULL COMMENT '所有部门名称';
+
+ALTER TABLE esua_epdc_news.epdc_news_statistics DROP COLUMN `STREET_ID`;
+ALTER TABLE esua_epdc_news.epdc_news_statistics DROP COLUMN `COMMUNITY_ID`;
+ALTER TABLE esua_epdc_news.epdc_news_statistics ADD PARENT_DEPT_IDS VARCHAR(1024) NULL COMMENT '父所有部门';
+ALTER TABLE esua_epdc_news.epdc_news_statistics ADD PARENT_DEPT_NAMES VARCHAR(1024) NULL COMMENT '父所有部门';
+ALTER TABLE esua_epdc_news.epdc_news_statistics ADD ALL_DEPT_IDS varchar(512) NULL COMMENT '所有部门ID';
+ALTER TABLE esua_epdc_news.epdc_news_statistics ADD ALL_DEPT_NAMES varchar(512) NULL COMMENT '所有部门名称';
+
+ALTER TABLE esua_epdc_news.epdc_notice DROP COLUMN `STREET`;
+ALTER TABLE esua_epdc_news.epdc_notice DROP COLUMN `STREET_ID`;
+ALTER TABLE esua_epdc_news.epdc_notice DROP COLUMN `COMMUNITY`;
+ALTER TABLE esua_epdc_news.epdc_notice DROP COLUMN `COMMUNITY_ID`;
+ALTER TABLE esua_epdc_news.epdc_notice DROP COLUMN `GRID`;
+ALTER TABLE esua_epdc_news.epdc_notice DROP COLUMN `GRID_ID`;
+ALTER TABLE esua_epdc_news.epdc_notice ADD PARENT_DEPT_IDS VARCHAR(1024) NULL COMMENT '父所有部门';
+ALTER TABLE esua_epdc_news.epdc_notice ADD PARENT_DEPT_NAMES VARCHAR(1024) NULL COMMENT '父所有部门';
+ALTER TABLE esua_epdc_news.epdc_notice ADD ALL_DEPT_IDS varchar(512) NULL COMMENT '所有部门ID';
+ALTER TABLE esua_epdc_news.epdc_notice ADD ALL_DEPT_NAMES varchar(512) NULL COMMENT '所有部门名称';
+
+------------------------------------------2019-11-27-----------------------------------------------
diff --git a/esua-epdc/doc/branch/dev_1118/db/esua_epdc_user.sql b/esua-epdc/doc/branch/dev_1118/db/esua_epdc_user.sql
new file mode 100644
index 000000000..68f8623cc
--- /dev/null
+++ b/esua-epdc/doc/branch/dev_1118/db/esua_epdc_user.sql
@@ -0,0 +1,42 @@
+------------------------------------------2019-11-27-----------------------------------------------
+ALTER TABLE esua_epdc_user.epdc_party_authentication_failed DROP COLUMN `STREET_NAME`;
+ALTER TABLE esua_epdc_user.epdc_party_authentication_failed DROP COLUMN `STREET_ID`;
+ALTER TABLE esua_epdc_user.epdc_party_authentication_failed DROP COLUMN `COMMUNITY_NAME`;
+ALTER TABLE esua_epdc_user.epdc_party_authentication_failed DROP COLUMN `COMMUNITY_ID`;
+ALTER TABLE esua_epdc_user.epdc_party_authentication_failed ADD PARENT_DEPT_IDS VARCHAR(512) NULL COMMENT '父所有部门';
+ALTER TABLE esua_epdc_user.epdc_party_authentication_failed ADD PARENT_DEPT_NAMES VARCHAR(512) NULL COMMENT '父所有部门';
+ALTER TABLE esua_epdc_user.epdc_party_authentication_failed ADD ALL_DEPT_IDS varchar(512) NULL COMMENT '所有部门ID';
+ALTER TABLE esua_epdc_user.epdc_party_authentication_failed ADD ALL_DEPT_NAMES varchar(512) NULL COMMENT '所有部门名称';
+
+ALTER TABLE esua_epdc_user.epdc_party_members DROP COLUMN `STREET_NAME`;
+ALTER TABLE esua_epdc_user.epdc_party_members DROP COLUMN `STREET_ID`;
+ALTER TABLE esua_epdc_user.epdc_party_members DROP COLUMN `COMMUNITY_NAME`;
+ALTER TABLE esua_epdc_user.epdc_party_members DROP COLUMN `COMMUNITY_ID`;
+ALTER TABLE esua_epdc_user.epdc_party_members ADD PARENT_DEPT_IDS VARCHAR(512) NULL COMMENT '父所有部门';
+ALTER TABLE esua_epdc_user.epdc_party_members ADD PARENT_DEPT_NAMES VARCHAR(512) NULL COMMENT '父所有部门';
+ALTER TABLE esua_epdc_user.epdc_party_members ADD ALL_DEPT_IDS varchar(512) NULL COMMENT '所有部门ID';
+ALTER TABLE esua_epdc_user.epdc_party_members ADD ALL_DEPT_NAMES varchar(512) NULL COMMENT '所有部门名称';
+
+ALTER TABLE esua_epdc_user.epdc_user DROP COLUMN `DISTRICT`;
+ALTER TABLE esua_epdc_user.epdc_user DROP COLUMN `DISTRICT_ID`;
+ALTER TABLE esua_epdc_user.epdc_user DROP COLUMN `STREET`;
+ALTER TABLE esua_epdc_user.epdc_user DROP COLUMN `STREET_ID`;
+ALTER TABLE esua_epdc_user.epdc_user DROP COLUMN `COMMUNITY`;
+ALTER TABLE esua_epdc_user.epdc_user DROP COLUMN `COMMUNITY_ID`;
+ALTER TABLE esua_epdc_user.epdc_user ADD PARENT_DEPT_IDS VARCHAR(512) NULL COMMENT '父所有部门';
+ALTER TABLE esua_epdc_user.epdc_user ADD PARENT_DEPT_NAMES VARCHAR(512) NULL COMMENT '父所有部门';
+ALTER TABLE esua_epdc_user.epdc_user ADD ALL_DEPT_IDS varchar(512) NULL COMMENT '所有部门ID';
+ALTER TABLE esua_epdc_user.epdc_user ADD ALL_DEPT_NAMES varchar(512) NULL COMMENT '所有部门名称';
+
+ALTER TABLE esua_epdc_user.epdc_user_grid_relation DROP COLUMN `DISTRICT`;
+ALTER TABLE esua_epdc_user.epdc_user_grid_relation DROP COLUMN `DISTRICT_ID`;
+ALTER TABLE esua_epdc_user.epdc_user_grid_relation DROP COLUMN `STREET_ID`;
+ALTER TABLE esua_epdc_user.epdc_user_grid_relation DROP COLUMN `STREET`;
+ALTER TABLE esua_epdc_user.epdc_user_grid_relation DROP COLUMN `COMMUNITY`;
+ALTER TABLE esua_epdc_user.epdc_user_grid_relation DROP COLUMN `COMMUNITY_ID`;
+ALTER TABLE esua_epdc_user.epdc_user_grid_relation ADD PARENT_DEPT_IDS VARCHAR(512) NULL COMMENT '父所有部门';
+ALTER TABLE esua_epdc_user.epdc_user_grid_relation ADD PARENT_DEPT_NAMES VARCHAR(512) NULL COMMENT '父所有部门';
+ALTER TABLE esua_epdc_user.epdc_user_grid_relation ADD ALL_DEPT_IDS varchar(512) NULL COMMENT '所有部门ID';
+ALTER TABLE esua_epdc_user.epdc_user_grid_relation ADD ALL_DEPT_NAMES varchar(512) NULL COMMENT '所有部门名称';
+
+------------------------------------------2019-11-27-----------------------------------------------
diff --git a/esua-epdc/doc/db/newupdate.sql b/esua-epdc/doc/db/newupdate.sql
index 72631d3f1..f26e4f39a 100644
--- a/esua-epdc/doc/db/newupdate.sql
+++ b/esua-epdc/doc/db/newupdate.sql
@@ -5,4 +5,6 @@ ALTER TABLE esua_epdc_admin.sys_dept ADD type_key varchar(50) NULL COMMENT '机
 ALTER TABLE sys_dept ADD party_code varchar(50)
 
 -------------  2019-09-24 --------------------
-ALTER TABLE epdc_user ADD REMARK VARCHAR(255) NULL COMMENT '审核备注'
+ALTER TABLE epdc_user ADD REMARK VARCHAR(255) NULL COMMENT '审核备注';
+
+
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/AppMenuTemplateDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/AppMenuTemplateDao.xml
index c9dd0caca..686ad744a 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/AppMenuTemplateDao.xml
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/AppMenuTemplateDao.xml
@@ -10,7 +10,6 @@
         <result property="startColor" column="START_COLOR"/>
         <result property="endColor" column="END_COLOR"/>
         <result property="lableColor" column="LABLE_COLOR"/>
-        <result property="icon" column="ICON"/>
         <result property="templateCode" column="TEMPLATE_CODE"/>
         <result property="templateName" column="TEMPLATE_NAME"/>
         <result property="revision" column="REVISION"/>
diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/UploadFileToServerUtils.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/UploadFileUtils.java
similarity index 85%
rename from esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/UploadFileToServerUtils.java
rename to esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/UploadFileUtils.java
index b712c1fa7..95d136a18 100644
--- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/UploadFileToServerUtils.java
+++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/UploadFileUtils.java
@@ -9,7 +9,7 @@ import java.io.File;
  * @Author：liuchuang
  * @Date：2019/11/22 16:28
  */
-public class UploadFileToServerUtils {
+public class UploadFileUtils {
 
     public static String uploadFile(File file) {
         return "";
diff --git a/esua-epdc/epdc-gateway/src/main/resources/application.yml b/esua-epdc/epdc-gateway/src/main/resources/application.yml
index cb98c62d6..bb363122e 100644
--- a/esua-epdc/epdc-gateway/src/main/resources/application.yml
+++ b/esua-epdc/epdc-gateway/src/main/resources/application.yml
@@ -204,6 +204,7 @@ renren:
   workLoginUrls:
     - /api/work/user/getToken #工作端-获取token
     - /api/work/user/login #工作端-登录
+    - /api/work/*/swagger/**
   workUrls:
     - /api/work/** #工作端接口
 
diff --git a/esua-epdc/epdc-module/epdc-activiti/db/mysql.sql b/esua-epdc/epdc-module/epdc-activiti/db/mysql.sql
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/db/oracle.sql b/esua-epdc/epdc-module/epdc-activiti/db/oracle.sql
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/db/postgresql.sql b/esua-epdc/epdc-module/epdc-activiti/db/postgresql.sql
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/db/sqlserver.sql b/esua-epdc/epdc-module/epdc-activiti/db/sqlserver.sql
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-client/pom.xml b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-client/pom.xml
old mode 100644
new mode 100755
index 1f14ad2f7..4f321fb52
--- a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-client/pom.xml
+++ b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-client/pom.xml
@@ -12,26 +12,21 @@
     <artifactId>epdc-activiti-client</artifactId>
     <packaging>jar</packaging>
 
-    <properties>
-        <swagger.version>2.7.0</swagger.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>com.esua.epdc</groupId>
             <artifactId>epdc-commons-tools</artifactId>
             <version>1.0.0</version>
         </dependency>
-
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger2</artifactId>
-            <version>${swagger.version}</version>
+            <version>2.7.0</version>
         </dependency>
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger-ui</artifactId>
-            <version>${swagger.version}</version>
+            <version>2.7.0</version>
         </dependency>
     </dependencies>
 
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-client/src/main/java/com/elink/esua/epdc/dto/ModelDTO.java b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-client/src/main/java/com/elink/esua/epdc/dto/ModelDTO.java
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/pom.xml b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/pom.xml
old mode 100644
new mode 100755
index f04b78fe4..8ec0a37fa
--- a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/pom.xml
@@ -13,7 +13,7 @@
     <packaging>jar</packaging>
 
     <properties>
-        <activiti.version>6.0.0</activiti.version>
+        <activiti.version>5.22.0</activiti.version>
     </properties>
 
     <dependencies>
@@ -41,8 +41,8 @@
             <artifactId>spring-context-support</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
         </dependency>
         <dependency>
             <groupId>de.codecentric</groupId>
@@ -60,48 +60,41 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.activiti</groupId>
+            <artifactId>activiti-explorer</artifactId>
+            <version>${activiti.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>vaadin</artifactId>
+                    <groupId>com.vaadin</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>dcharts-widget</artifactId>
+                    <groupId>org.vaadin.addons</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>activiti-simple-workflow</artifactId>
+                    <groupId>org.activiti</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>slf4j-log4j12</artifactId>
+                    <groupId>org.slf4j</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.activiti</groupId>
+            <artifactId>activiti-diagram-rest</artifactId>
+            <version>${activiti.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.activiti</groupId>
+            <artifactId>activiti-modeler</artifactId>
+            <version>${activiti.version}</version>
+        </dependency>
     </dependencies>
 
-
-    <profiles>
-        <profile>
-            <id>dev</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <properties>
-                <server.port>9057</server.port>
-                <spring.profiles.active>dev</spring.profiles.active>
-
-                <!-- nacos -->
-                <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
-            </properties>
-        </profile>
-        <profile>
-            <id>test</id>
-            <properties>
-                <server.port>9057</server.port>
-                <spring.profiles.active>test</spring.profiles.active>
-
-                <!-- nacos -->
-                <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
-            </properties>
-        </profile>
-        <profile>
-            <id>prod</id>
-            <properties>
-                <server.port>9057</server.port>
-                <spring.profiles.active>prod</spring.profiles.active>
-
-                <!-- nacos -->
-                <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
-            </properties>
-        </profile>
-    </profiles>
-
     <build>
         <finalName>${project.artifactId}</finalName>
         <plugins>
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/processon/demo1.bpmn b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/processon/demo1.bpmn
deleted file mode 100644
index f860f8979..000000000
--- a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/processon/demo1.bpmn
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:activiti="http://activiti.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" expressionLanguage="http://www.w3.org/1999/XPath" id="m1567478636229" name="" targetNamespace="http://www.activiti.org/testm1567478636229" typeLanguage="http://www.w3.org/2001/XMLSchema">
-  <process id="demoTask" isClosed="false" isExecutable="true" name="测试任务流程" processType="None">
-    <startEvent id="_2" name="StartEvent"/>
-    <endEvent id="_3" name="EndEvent"/>
-    <userTask activiti:assignee="${deptId}" activiti:exclusive="true" id="_4" name="初次审核">
-      <extensionElements>
-        <activiti:executionListener event="end" expression="审核完成"/>
-      </extensionElements>
-    </userTask>
-    <userTask activiti:assignee="${deptId}" activiti:exclusive="true" id="_5" name="二次审核">
-      <extensionElements>
-        <activiti:executionListener event="end" expression="审核完成"/>
-      </extensionElements>
-    </userTask>
-    <sequenceFlow id="_6" sourceRef="_2" targetRef="_4"/>
-    <sequenceFlow id="_7" sourceRef="_4" targetRef="_5"/>
-    <sequenceFlow id="_8" sourceRef="_5" targetRef="_3"/>
-  </process>
-  <bpmndi:BPMNDiagram documentation="background=#FFFFFF;count=1;horizontalcount=1;orientation=0;width=842.4;height=1195.2;imageableWidth=832.4;imageableHeight=1185.2;imageableX=5.0;imageableY=5.0" id="Diagram-_1" name="New Diagram">
-    <bpmndi:BPMNPlane bpmnElement="demoTask">
-      <bpmndi:BPMNShape bpmnElement="_2" id="Shape-_2">
-        <dc:Bounds height="32.0" width="32.0" x="370.0" y="60.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="_3" id="Shape-_3">
-        <dc:Bounds height="32.0" width="32.0" x="375.0" y="640.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="_4" id="Shape-_4">
-        <dc:Bounds height="55.0" width="85.0" x="350.0" y="225.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="55.0" width="85.0" x="0.0" y="0.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="_5" id="Shape-_5">
-        <dc:Bounds height="55.0" width="85.0" x="355.0" y="415.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="55.0" width="85.0" x="0.0" y="0.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge bpmnElement="_6" id="BPMNEdge__6" sourceElement="_2" targetElement="_4">
-        <di:waypoint x="386.0" y="92.0"/>
-        <di:waypoint x="386.0" y="225.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="_7" id="BPMNEdge__7" sourceElement="_4" targetElement="_5">
-        <di:waypoint x="395.0" y="280.0"/>
-        <di:waypoint x="395.0" y="415.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="_8" id="BPMNEdge__8" sourceElement="_5" targetElement="_3">
-        <di:waypoint x="391.0" y="470.0"/>
-        <di:waypoint x="391.0" y="640.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-    </bpmndi:BPMNPlane>
-  </bpmndi:BPMNDiagram>
-</definitions>
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/processon/yishi.bpmn b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/processon/yishi.bpmn
deleted file mode 100644
index 152a2efff..000000000
--- a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/processon/yishi.bpmn
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:activiti="http://activiti.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" xmlns:tns="http://www.activiti.org/test" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" expressionLanguage="http://www.w3.org/1999/XPath" id="m1566628843418" name="" targetNamespace="http://www.activiti.org/test" typeLanguage="http://www.w3.org/2001/XMLSchema">
-  <process id="myProcess_1" isClosed="false" isExecutable="true" processType="None">
-    <startEvent id="_2" name="testTaskStart"/>
-    <endEvent id="_6" name="testTaskEnd"/>
-    <userTask activiti:exclusive="true" id="_11" name="UserTask">
-      <extensionElements>
-        <activiti:executionListener event="start" expression="test"/>
-      </extensionElements>
-    </userTask>
-    <sequenceFlow id="_13" sourceRef="_2" targetRef="_11"/>
-    <sequenceFlow id="_14" sourceRef="_11" targetRef="_6"/>
-  </process>
-  <bpmndi:BPMNDiagram documentation="background=#3C3F41;count=1;horizontalcount=1;orientation=0;width=842.4;height=1195.2;imageableWidth=832.4;imageableHeight=1185.2;imageableX=5.0;imageableY=5.0" id="Diagram-_1" name="New Diagram">
-    <bpmndi:BPMNPlane bpmnElement="myProcess_1">
-      <bpmndi:BPMNShape bpmnElement="_2" id="Shape-_2">
-        <omgdc:Bounds height="32.0" width="32.0" x="290.0" y="55.0"/>
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="_6" id="Shape-_6">
-        <omgdc:Bounds height="32.0" width="32.0" x="285.0" y="515.0"/>
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="_11" id="Shape-_11">
-        <omgdc:Bounds height="55.0" width="85.0" x="530.0" y="240.0"/>
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="55.0" width="85.0" x="0.0" y="0.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge bpmnElement="_13" id="BPMNEdge__13" sourceElement="_2" targetElement="_11">
-        <omgdi:waypoint x="322.0" y="71.0"/>
-        <omgdi:waypoint x="530.0" y="267.5"/>
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="_14" id="BPMNEdge__14" sourceElement="_11" targetElement="_6">
-        <omgdi:waypoint x="530.0" y="267.5"/>
-        <omgdi:waypoint x="317.0" y="531.0"/>
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-    </bpmndi:BPMNPlane>
-  </bpmndi:BPMNDiagram>
-</definitions>
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/ActivitiApplication.java b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/ActivitiApplication.java
old mode 100644
new mode 100755
index c8bcbea4c..3ff8e300a
--- a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/ActivitiApplication.java
+++ b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/ActivitiApplication.java
@@ -1,8 +1,8 @@
 /**
  * Copyright (c) 2018 人人开源 All rights reserved.
- * <p>
+ *
  * https://www.renren.io
- * <p>
+ *
  * 版权所有，侵权必究！
  */
 
@@ -20,8 +20,8 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
  * @since 1.1.0
  */
 @SpringBootApplication(exclude = {
-        org.activiti.spring.boot.SecurityAutoConfiguration.class,
-        org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class
+    org.activiti.spring.boot.SecurityAutoConfiguration.class,
+    org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class
 })
 @EnableDiscoveryClient
 @EnableFeignClients
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/config/ProcessEngineConfig.java b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/config/ProcessEngineConfig.java
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/config/SwaggerConfig.java b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/config/SwaggerConfig.java
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/controller/ActIdController.java b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/controller/ActIdController.java
deleted file mode 100644
index 2b036e118..000000000
--- a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/controller/ActIdController.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.elink.esua.epdc.controller;
-
-import com.elink.esua.epdc.commons.tools.annotation.LogOperation;
-import com.elink.esua.epdc.commons.tools.constant.Constant;
-import com.elink.esua.epdc.commons.tools.page.PageData;
-import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.form.ActGroupFormDto;
-import com.elink.esua.epdc.dto.form.ActUserFormDto;
-import com.elink.esua.epdc.exception.ModuleErrorCode;
-import com.elink.esua.epdc.service.ActIdService;
-import com.elink.esua.epdc.service.ActProcessService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.apache.commons.io.IOUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import springfox.documentation.annotations.ApiIgnore;
-
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Map;
-
-/**
- * 用户和用户组控制类
- *
- * @author rongchao
- * @Date 19-9-6
- */
-@RestController
-@RequestMapping("actId")
-public class ActIdController {
-
-    @Autowired
-    private ActIdService actIdService;
-
-    /**
-     * 添加流程用户
-     *
-     * @param actUserFormDto
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.String>
-     * @author rongchao
-     * @since 2019-09-06
-     */
-    @PostMapping("addUser")
-    public Result<String> addUser(ActUserFormDto actUserFormDto) {
-        return actIdService.saveUser(actUserFormDto);
-    }
-
-    /**
-     * 添加用户组
-     *
-     * @param actGroupFormDto
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.String>
-     * @author rongchao
-     * @since 2019-09-06
-     */
-    @PostMapping("addGroup")
-    public Result<String> addGroup(ActGroupFormDto actGroupFormDto) {
-        return actIdService.saveGroup(actGroupFormDto);
-    }
-
-}
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/controller/ActModelController.java b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/controller/ActModelController.java
new file mode 100755
index 000000000..918fa9e83
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/controller/ActModelController.java
@@ -0,0 +1,92 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.tools.annotation.LogOperation;
+import com.elink.esua.epdc.commons.tools.constant.Constant;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.dto.ModelDTO;
+import com.elink.esua.epdc.service.ActModelService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.activiti.engine.repository.Model;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.Map;
+
+/**
+ * 模型管理
+ *
+ * @author Mark sunlightcs@gmail.com
+ */
+@RestController
+@RequestMapping("model")
+@Api(tags="模型管理")
+public class ActModelController {
+    @Autowired
+    private ActModelService actModelService;
+
+    @GetMapping("page")
+    @ApiOperation("分页")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType="int") ,
+        @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
+        @ApiImplicitParam(name = "key", value = "key", paramType = "query", dataType="String"),
+        @ApiImplicitParam(name = "name", value = "name", paramType = "query", dataType="String")
+    })
+    public Result<PageData<Model>> page(@ApiIgnore @RequestParam Map<String, Object> params){
+        PageData<Model> page = actModelService.page(params);
+
+        return new Result<PageData<Model>>().ok(page);
+    }
+
+    @PostMapping
+    @ApiOperation("新增模型")
+    @LogOperation("新增模型")
+    public Result save(@RequestBody ModelDTO dto) throws Exception{
+        //效验数据
+        ValidatorUtils.validateEntity(dto);
+
+        actModelService.save(dto.getName(), dto.getKey(), dto.getDescription());
+
+        return new Result();
+    }
+
+    @PostMapping("deploy/{id}")
+    @ApiOperation("部署")
+    @LogOperation("部署")
+    public Result deploy(@PathVariable("id") String id) {
+        actModelService.deploy(id);
+        return new Result();
+    }
+
+    @GetMapping("export/{id}")
+    @ApiOperation("导出")
+    @LogOperation("导出")
+    public void export(@PathVariable("id") String id, @ApiIgnore HttpServletResponse response) {
+        actModelService.export(id, response);
+    }
+
+    @DeleteMapping
+    @ApiOperation("删除")
+    @LogOperation("删除")
+    public Result delete(@RequestBody String[] ids) {
+        for(String id : ids) {
+            actModelService.delete(id);
+        }
+        return new Result();
+    }
+}
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/controller/ActProcessController.java b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/controller/ActProcessController.java
old mode 100644
new mode 100755
index 03028bc13..d336e4456
--- a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/controller/ActProcessController.java
+++ b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/controller/ActProcessController.java
@@ -88,15 +88,15 @@ public class ActProcessController {
         return new Result();
     }
 
-//    @PostMapping("convertToModel/{id}")
-//    @ApiOperation("将部署的流程转换为模型")
-//    @LogOperation("将部署的流程转换为模型")
-//    @ApiImplicitParam(name = "id", value = "流程ID", paramType = "query", dataType="String")
-//    public Result convertToModel(@PathVariable("id") String id) throws Exception {
-//        actProcessService.convertToModel(id);
-//
-//        return new Result();
-//    }
+    @PostMapping("convertToModel/{id}")
+    @ApiOperation("将部署的流程转换为模型")
+    @LogOperation("将部署的流程转换为模型")
+    @ApiImplicitParam(name = "id", value = "流程ID", paramType = "query", dataType="String")
+    public Result convertToModel(@PathVariable("id") String id) throws Exception {
+        actProcessService.convertToModel(id);
+
+        return new Result();
+    }
 
     @DeleteMapping
     @ApiOperation("删除流程")
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/controller/ActRunningController.java b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/controller/ActRunningController.java
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/dto/form/ActGroupFormDto.java b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/dto/form/ActGroupFormDto.java
deleted file mode 100644
index 292093c57..000000000
--- a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/dto/form/ActGroupFormDto.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.elink.esua.epdc.dto.form;
-
-import lombok.Data;
-
-/**
- * 流程用户组表单DTO
- *
- * @author rongchao
- * @Date 19-9-6
- */
-@Data
-public class ActGroupFormDto {
-
-    /**
-     * 用户组ID
-     */
-    private long groupId;
-
-    /**
-     * 用户组名
-     */
-    private String groupName;
-}
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/dto/form/ActUserFormDto.java b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/dto/form/ActUserFormDto.java
deleted file mode 100644
index 099f7d267..000000000
--- a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/dto/form/ActUserFormDto.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.elink.esua.epdc.dto.form;
-
-import lombok.Data;
-
-/**
- * 流程用户表单DTO
- *
- * @author rongchao
- * @Date 19-9-6
- */
-@Data
-public class ActUserFormDto {
-
-    /**
-     * 用户ID
-     */
-    private long userId;
-
-    /**
-     * 用户名
-     */
-    private String userName;
-}
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/editor/main/StencilsetRestResource.java b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/editor/main/StencilsetRestResource.java
new file mode 100755
index 000000000..191edb780
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/editor/main/StencilsetRestResource.java
@@ -0,0 +1,38 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.editor.main;
+
+import org.activiti.engine.ActivitiException;
+import org.apache.commons.io.IOUtils;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.io.InputStream;
+
+/**
+ * Stencilset
+ *
+ * @author Mark sunlightcs@gmail.com
+ */
+@RestController
+@RequestMapping("service")
+public class StencilsetRestResource {
+
+  @RequestMapping(value="/editor/stencilset", method = RequestMethod.GET, produces = "application/json;charset=utf-8")
+  public @ResponseBody String getStencilset() {
+    InputStream stencilsetStream = this.getClass().getClassLoader().getResourceAsStream("stencilset.json");
+    try {
+      return IOUtils.toString(stencilsetStream, "utf-8");
+    } catch (Exception e) {
+      throw new ActivitiException("Error while loading stencil set", e);
+    }
+  }
+}
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/editor/model/ModelEditorJsonRestResource.java b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/editor/model/ModelEditorJsonRestResource.java
new file mode 100755
index 000000000..67e0cbb56
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/editor/model/ModelEditorJsonRestResource.java
@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.editor.model;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.activiti.editor.constants.ModelDataJsonConstants;
+import org.activiti.engine.ActivitiException;
+import org.activiti.engine.RepositoryService;
+import org.activiti.engine.repository.Model;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * Model Editor
+ *
+ * @author Mark sunlightcs@gmail.com
+ */
+@RestController
+@RequestMapping("service")
+public class ModelEditorJsonRestResource implements ModelDataJsonConstants {
+
+    protected static final Logger LOGGER = LoggerFactory.getLogger(ModelEditorJsonRestResource.class);
+
+    @Autowired
+    private RepositoryService repositoryService;
+
+    @Autowired
+    private ObjectMapper objectMapper;
+
+    @RequestMapping(value = "/model/{modelId}/json", method = RequestMethod.GET, produces = "application/json")
+    public ObjectNode getEditorJson(@PathVariable String modelId) {
+        ObjectNode modelNode = null;
+
+        Model model = repositoryService.getModel(modelId);
+
+        if (model != null) {
+            try {
+                if (StringUtils.isNotEmpty(model.getMetaInfo())) {
+                    modelNode = (ObjectNode) objectMapper.readTree(model.getMetaInfo());
+                } else {
+                    modelNode = objectMapper.createObjectNode();
+                    modelNode.put(MODEL_NAME, model.getName());
+                }
+                modelNode.put(MODEL_ID, model.getId());
+                ObjectNode editorJsonNode = (ObjectNode) objectMapper.readTree(
+                        new String(repositoryService.getModelEditorSource(model.getId()), "utf-8"));
+                modelNode.set("model", editorJsonNode);
+
+            } catch (Exception e) {
+                LOGGER.error("Error creating model JSON", e);
+                throw new ActivitiException("Error creating model JSON", e);
+            }
+        }
+        return modelNode;
+    }
+}
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/editor/model/ModelSaveRestResource.java b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/editor/model/ModelSaveRestResource.java
new file mode 100755
index 000000000..cac6f0136
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/editor/model/ModelSaveRestResource.java
@@ -0,0 +1,90 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.editor.model;
+
+import com.elink.esua.epdc.commons.tools.xss.XssHttpServletRequestWrapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.activiti.editor.constants.ModelDataJsonConstants;
+import org.activiti.engine.ActivitiException;
+import org.activiti.engine.RepositoryService;
+import org.activiti.engine.repository.Model;
+import org.apache.batik.transcoder.TranscoderInput;
+import org.apache.batik.transcoder.TranscoderOutput;
+import org.apache.batik.transcoder.image.PNGTranscoder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+
+/**
+ * Model Rest
+ *
+ * @author Mark sunlightcs@gmail.com
+ */
+@RestController
+@RequestMapping("service")
+public class ModelSaveRestResource implements ModelDataJsonConstants {
+    protected static final Logger LOGGER = LoggerFactory.getLogger(ModelSaveRestResource.class);
+
+    @Autowired
+    private RepositoryService repositoryService;
+    @Autowired
+    private ObjectMapper objectMapper;
+
+    @RequestMapping(value = "/model/{modelId}/save", method = RequestMethod.PUT)
+    @ResponseStatus(value = HttpStatus.OK)
+    public void saveModel(@PathVariable String modelId, HttpServletRequest request) {
+        try {
+            HttpServletRequest orgRequest = XssHttpServletRequestWrapper.getOrgRequest(request);
+            String name = orgRequest.getParameter("name");
+            String description = orgRequest.getParameter("description");
+            String jsonXml = orgRequest.getParameter("json_xml");
+            String svgXml = orgRequest.getParameter("svg_xml");
+
+            Model model = repositoryService.getModel(modelId);
+
+            ObjectNode modelJson = (ObjectNode) objectMapper.readTree(model.getMetaInfo());
+
+            modelJson.put(MODEL_NAME, name);
+            modelJson.put(MODEL_DESCRIPTION, description);
+            model.setMetaInfo(modelJson.toString());
+            model.setName(name);
+
+            repositoryService.saveModel(model);
+
+            repositoryService.addModelEditorSource(model.getId(), jsonXml.getBytes("utf-8"));
+
+            InputStream svgStream = new ByteArrayInputStream(svgXml.getBytes("utf-8"));
+            TranscoderInput input = new TranscoderInput(svgStream);
+
+            PNGTranscoder transcoder = new PNGTranscoder();
+            // Setup output
+            ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+            TranscoderOutput output = new TranscoderOutput(outStream);
+
+            // Do the transformation
+            transcoder.transcode(input, output);
+            final byte[] result = outStream.toByteArray();
+            repositoryService.addModelEditorSourceExtra(model.getId(), result);
+            outStream.close();
+
+        } catch (Exception e) {
+            LOGGER.error("Error saving model", e);
+            throw new ActivitiException("Error saving model", e);
+        }
+    }
+
+}
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/exception/ModuleErrorCode.java b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/exception/ModuleErrorCode.java
old mode 100644
new mode 100755
index 007ab2b18..97988f469
--- a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/exception/ModuleErrorCode.java
+++ b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/exception/ModuleErrorCode.java
@@ -8,6 +8,7 @@
 
 package com.elink.esua.epdc.exception;
 
+
 import com.elink.esua.epdc.commons.tools.exception.ErrorCode;
 
 /**
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/ActIdService.java b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/ActIdService.java
deleted file mode 100644
index a6dc85598..000000000
--- a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/ActIdService.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.elink.esua.epdc.service;
-
-import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.form.ActGroupFormDto;
-import com.elink.esua.epdc.dto.form.ActUserFormDto;
-
-/**
- * 流程用户服务接口类
- *
- * @author rongchao
- * @Date 19-9-6
- */
-public interface ActIdService {
-
-    /**
-     * 添加用户
-     *
-     * @param actUserFormDto 用户名
-     * @return boolean
-     * @author rongchao
-     * @since 2019-09-06
-     */
-    Result<String> saveUser(ActUserFormDto actUserFormDto);
-
-    /**
-     * 添加用户组
-     *
-     * @param actGroupFormDto 用户组名
-     * @return boolean
-     * @author rongchao
-     * @since 2019-09-06
-     */
-    Result<String> saveGroup(ActGroupFormDto actGroupFormDto);
-
-    /**
-     * 修改用户组名
-     *
-     * @param newGroupName
-     * @return boolean
-     * @author rongchao
-     * @since 2019-09-06
-     */
-    Result<String> modifyGroupName(String newGroupName);
-
-}
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/ActModelService.java b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/ActModelService.java
old mode 100644
new mode 100755
index 580774e44..2e3bd7483
--- a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/ActModelService.java
+++ b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/ActModelService.java
@@ -1,23 +1,37 @@
 /**
  * Copyright (c) 2018 人人开源 All rights reserved.
- *
+ * <p>
  * https://www.renren.io
- *
+ * <p>
  * 版权所有，侵权必究！
  */
 
 package com.elink.esua.epdc.service;
 
 import com.elink.esua.epdc.commons.tools.constant.Constant;
+import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.exception.ModuleErrorCode;
+import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.activiti.bpmn.converter.BpmnXMLConverter;
+import org.activiti.bpmn.model.BpmnModel;
+import org.activiti.editor.constants.ModelDataJsonConstants;
+import org.activiti.editor.language.json.converter.BpmnJsonConverter;
 import org.activiti.engine.RepositoryService;
+import org.activiti.engine.repository.Deployment;
 import org.activiti.engine.repository.Model;
 import org.activiti.engine.repository.ModelQuery;
+import org.activiti.engine.repository.ProcessDefinition;
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.ByteArrayInputStream;
+import java.io.UnsupportedEncodingException;
 import java.util.List;
 import java.util.Map;
 
@@ -34,104 +48,104 @@ public class ActModelService {
     private ObjectMapper objectMapper;
 
     public PageData<Model> page(Map<String, Object> params) {
-        String key = (String)params.get("key");
-        String name = (String)params.get("name");
+        String key = (String) params.get("key");
+        String name = (String) params.get("name");
 
         //分页参数
         Integer curPage = 1;
         Integer limit = 10;
-        if(params.get(Constant.PAGE) != null){
-            curPage = Integer.parseInt((String)params.get(Constant.PAGE));
+        if (params.get(Constant.PAGE) != null) {
+            curPage = Integer.parseInt((String) params.get(Constant.PAGE));
         }
-        if(params.get(Constant.LIMIT) != null){
-            limit = Integer.parseInt((String)params.get(Constant.LIMIT));
+        if (params.get(Constant.LIMIT) != null) {
+            limit = Integer.parseInt((String) params.get(Constant.LIMIT));
         }
 
         ModelQuery modelQuery = repositoryService.createModelQuery().latestVersion().orderByLastUpdateTime().desc();
 
-        if(StringUtils.isNotEmpty(key)){
+        if (StringUtils.isNotEmpty(key)) {
             modelQuery.modelKey(key);
         }
-        if(StringUtils.isNotEmpty(name)){
+        if (StringUtils.isNotEmpty(name)) {
             modelQuery.modelName(name);
         }
 
         List<Model> list = modelQuery.listPage((curPage - 1) * limit, limit);
-        return new PageData<>(list, (int)modelQuery.count());
+        return new PageData<>(list, (int) modelQuery.count());
+    }
+
+    public void save(String name, String key, String description) throws UnsupportedEncodingException {
+        //新建一个空模型
+        Model model = repositoryService.newModel();
+
+        //metaInfo信息
+        ObjectNode metaInfo = objectMapper.createObjectNode();
+        metaInfo.put(ModelDataJsonConstants.MODEL_NAME, name);
+        metaInfo.put(ModelDataJsonConstants.MODEL_DESCRIPTION, description);
+        metaInfo.put(ModelDataJsonConstants.MODEL_REVISION, model.getVersion());
+
+        model.setKey(key);
+        model.setName(name);
+        model.setMetaInfo(metaInfo.toString());
+
+        repositoryService.saveModel(model);
+
+        ObjectNode editorNode = objectMapper.createObjectNode();
+        editorNode.put("id", "canvas");
+        editorNode.put("resourceId", "canvas");
+        ObjectNode stencilset = objectMapper.createObjectNode();
+        stencilset.put("namespace", "http://b3mn.org/stencilset/bpmn2.0#");
+        editorNode.set("stencilset", stencilset);
+        repositoryService.addModelEditorSource(model.getId(), editorNode.toString().getBytes("utf-8"));
     }
 
-//    public void save(String name, String key, String description) throws UnsupportedEncodingException {
-//        //新建一个空模型
-//        Model model = repositoryService.newModel();
-//
-//        //metaInfo信息
-//        ObjectNode metaInfo = objectMapper.createObjectNode();
-//        metaInfo.put(ModelDataJsonConstants.MODEL_NAME, name);
-//        metaInfo.put(ModelDataJsonConstants.MODEL_DESCRIPTION, description);
-//        metaInfo.put(ModelDataJsonConstants.MODEL_REVISION, model.getVersion());
-//
-//        model.setKey(key);
-//        model.setName(name);
-//        model.setMetaInfo(metaInfo.toString());
-//
-//        repositoryService.saveModel(model);
-//
-//        ObjectNode editorNode = objectMapper.createObjectNode();
-//        editorNode.put("id", "canvas");
-//        editorNode.put("resourceId", "canvas");
-//        ObjectNode stencilset = objectMapper.createObjectNode();
-//        stencilset.put("namespace", "http://b3mn.org/stencilset/bpmn2.0#");
-//        editorNode.set("stencilset", stencilset);
-//        repositoryService.addModelEditorSource(model.getId(), editorNode.toString().getBytes("utf-8"));
-//    }
-//
-//    public void deploy(String id) {
-//        try {
-//            Model model = repositoryService.getModel(id);
-//            BpmnJsonConverter jsonConverter = new BpmnJsonConverter();
-//            JsonNode editorNode = new ObjectMapper().readTree(repositoryService.getModelEditorSource(model.getId()));
-//            BpmnModel bpmnModel = jsonConverter.convertToBpmnModel(editorNode);
-//            BpmnXMLConverter xmlConverter = new BpmnXMLConverter();
-//            byte[] bpmnBytes = xmlConverter.convertToXML(bpmnModel);
-//
-//            String processName = model.getName();
-//            if (!StringUtils.endsWith(processName, ".bpmn20.xml")){
-//                processName += ".bpmn20.xml";
-//            }
-//
-//            ByteArrayInputStream in = new ByteArrayInputStream(bpmnBytes);
-//            Deployment deployment = repositoryService.createDeployment().name(model.getName()).addInputStream(processName, in).deploy();
-//
-//            List<ProcessDefinition> list = repositoryService.createProcessDefinitionQuery().deploymentId(deployment.getId()).list();
-//            if (list.size() == 0){
-//                throw new RenException(ModuleErrorCode.ACT_DEPLOY_ERROR);
-//            }
-//        } catch (Exception e) {
-//            throw new RenException(ModuleErrorCode.ACT_MODEL_IMG_ERROR, e);
-//        }
-//    }
-//
-//    /**
-//     * 导出模型
-//     */
-//    public void export(String id, HttpServletResponse response) {
-//        try {
-//            Model model = repositoryService.getModel(id);
-//            BpmnJsonConverter jsonConverter = new BpmnJsonConverter();
-//            JsonNode editorNode = new ObjectMapper().readTree(repositoryService.getModelEditorSource(model.getId()));
-//            BpmnModel bpmnModel = jsonConverter.convertToBpmnModel(editorNode);
-//            BpmnXMLConverter xmlConverter = new BpmnXMLConverter();
-//            byte[] bpmnBytes = xmlConverter.convertToXML(bpmnModel);
-//
-//            ByteArrayInputStream in = new ByteArrayInputStream(bpmnBytes);
-//            IOUtils.copy(in, response.getOutputStream());
-//            String filename = bpmnModel.getMainProcess().getId() + ".bpmn20.xml";
-//            response.setHeader("Content-Disposition", "attachment; filename=" + filename);
-//            response.flushBuffer();
-//        } catch (Exception e) {
-//            throw new RenException(ModuleErrorCode.ACT_MODEL_EXPORT_ERROR, id);
-//        }
-//    }
+    public void deploy(String id) {
+        try {
+            Model model = repositoryService.getModel(id);
+            BpmnJsonConverter jsonConverter = new BpmnJsonConverter();
+            JsonNode editorNode = new ObjectMapper().readTree(repositoryService.getModelEditorSource(model.getId()));
+            BpmnModel bpmnModel = jsonConverter.convertToBpmnModel(editorNode);
+            BpmnXMLConverter xmlConverter = new BpmnXMLConverter();
+            byte[] bpmnBytes = xmlConverter.convertToXML(bpmnModel);
+
+            String processName = model.getName();
+            if (!StringUtils.endsWith(processName, ".bpmn20.xml")) {
+                processName += ".bpmn20.xml";
+            }
+
+            ByteArrayInputStream in = new ByteArrayInputStream(bpmnBytes);
+            Deployment deployment = repositoryService.createDeployment().name(model.getName()).addInputStream(processName, in).deploy();
+
+            List<ProcessDefinition> list = repositoryService.createProcessDefinitionQuery().deploymentId(deployment.getId()).list();
+            if (list.size() == 0) {
+                throw new RenException(ModuleErrorCode.ACT_DEPLOY_ERROR);
+            }
+        } catch (Exception e) {
+            throw new RenException(ModuleErrorCode.ACT_MODEL_IMG_ERROR, e);
+        }
+    }
+
+    /**
+     * 导出模型
+     */
+    public void export(String id, HttpServletResponse response) {
+        try {
+            Model model = repositoryService.getModel(id);
+            BpmnJsonConverter jsonConverter = new BpmnJsonConverter();
+            JsonNode editorNode = new ObjectMapper().readTree(repositoryService.getModelEditorSource(model.getId()));
+            BpmnModel bpmnModel = jsonConverter.convertToBpmnModel(editorNode);
+            BpmnXMLConverter xmlConverter = new BpmnXMLConverter();
+            byte[] bpmnBytes = xmlConverter.convertToXML(bpmnModel);
+
+            ByteArrayInputStream in = new ByteArrayInputStream(bpmnBytes);
+            IOUtils.copy(in, response.getOutputStream());
+            String filename = bpmnModel.getMainProcess().getId() + ".bpmn20.xml";
+            response.setHeader("Content-Disposition", "attachment; filename=" + filename);
+            response.flushBuffer();
+        } catch (Exception e) {
+            throw new RenException(ModuleErrorCode.ACT_MODEL_EXPORT_ERROR, id);
+        }
+    }
 
     /**
      * 删除模型
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/ActProcessService.java b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/ActProcessService.java
old mode 100644
new mode 100755
index 00dd945b2..0976c1a44
--- a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/ActProcessService.java
+++ b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/ActProcessService.java
@@ -1,8 +1,8 @@
 /**
  * Copyright (c) 2018 人人开源 All rights reserved.
- * <p>
+ *
  * https://www.renren.io
- * <p>
+ *
  * 版权所有，侵权必究！
  */
 
@@ -12,8 +12,15 @@ import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.exception.ModuleErrorCode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.activiti.bpmn.converter.BpmnXMLConverter;
+import org.activiti.bpmn.model.BpmnModel;
+import org.activiti.editor.constants.ModelDataJsonConstants;
+import org.activiti.editor.language.json.converter.BpmnJsonConverter;
 import org.activiti.engine.RepositoryService;
 import org.activiti.engine.repository.Deployment;
+import org.activiti.engine.repository.Model;
 import org.activiti.engine.repository.ProcessDefinition;
 import org.activiti.engine.repository.ProcessDefinitionQuery;
 import org.apache.commons.io.FilenameUtils;
@@ -22,8 +29,13 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -42,31 +54,28 @@ public class ActProcessService {
 
     /**
      * 流程列表
-     *
-     * @param params
-     * @return
      */
     public PageData<Map<String, Object>> page(Map<String, Object> params) {
-        String key = (String) params.get("key");
-        String processName = (String) params.get("processName");
+        String key = (String)params.get("key");
+        String processName = (String)params.get("processName");
 
         //分页参数
         Integer curPage = 1;
         Integer limit = 10;
-        if (params.get(Constant.PAGE) != null) {
-            curPage = Integer.parseInt((String) params.get(Constant.PAGE));
+        if(params.get(Constant.PAGE) != null){
+            curPage = Integer.parseInt((String)params.get(Constant.PAGE));
         }
-        if (params.get(Constant.LIMIT) != null) {
-            limit = Integer.parseInt((String) params.get(Constant.LIMIT));
+        if(params.get(Constant.LIMIT) != null){
+            limit = Integer.parseInt((String)params.get(Constant.LIMIT));
         }
 
         ProcessDefinitionQuery processDefinitionQuery = repositoryService.createProcessDefinitionQuery().latestVersion()
-                .orderByProcessDefinitionId().desc().orderByProcessDefinitionKey().desc();
+            .orderByProcessDefinitionId().desc().orderByProcessDefinitionKey().desc();
 
-        if (StringUtils.isNotEmpty(key)) {
+        if(StringUtils.isNotEmpty(key)){
             processDefinitionQuery.processDefinitionKeyLike(key);
         }
-        if (StringUtils.isNotEmpty(processName)) {
+        if(StringUtils.isNotEmpty(processName)){
             processDefinitionQuery.processDefinitionNameLike(processName);
         }
 
@@ -77,7 +86,7 @@ public class ActProcessService {
             objectList.add(processDefinitionConvert(processDefinition));
         }
 
-        return new PageData<>(objectList, (int) processDefinitionQuery.count());
+        return new PageData<>(objectList, (int)processDefinitionQuery.count());
     }
 
 
@@ -104,90 +113,85 @@ public class ActProcessService {
 
     /**
      * 部署
-     *
      * @param file 文件
      */
     public void deploy(MultipartFile file) throws IOException {
         String fileName = file.getOriginalFilename();
         String extension = FilenameUtils.getExtension(fileName);
-        if ("zip".equalsIgnoreCase(extension) || "bar".equalsIgnoreCase(extension)) {
+        if("zip".equalsIgnoreCase(extension) || "bar".equalsIgnoreCase(extension)) {
             ZipInputStream zip = new ZipInputStream(file.getInputStream());
             repositoryService.createDeployment().addZipInputStream(zip).deploy();
-        } else if (fileName.indexOf("bpmn20.xml") != -1) {
+        }else if(fileName.indexOf("bpmn20.xml") != -1){
             repositoryService.createDeployment().addInputStream(fileName, file.getInputStream()).deploy();
-        } else if ("bpmn".equalsIgnoreCase(extension)) {
+        }else if("bpmn".equalsIgnoreCase(extension)){
             repositoryService.createDeployment().addInputStream(fileName, file.getInputStream()).deploy();
-        } else {
+        }else{
             throw new RenException(ModuleErrorCode.ACT_DEPLOY_FORMAT_ERROR);
         }
     }
 
     /**
      * 激活流程
-     *
      * @param id 流程ID
      */
-    public void active(String id) {
+    public void active(String id){
         repositoryService.activateProcessDefinitionById(id, true, null);
     }
 
     /**
      * 挂起流程
-     *
      * @param id 流程ID
      */
-    public void suspend(String id) {
+    public void suspend(String id){
         repositoryService.suspendProcessDefinitionById(id, true, null);
     }
 
-//    /**
-//     * 将部署的流程转换为模型
-//     * @param id 流程ID
-//     */
-//    public Model convertToModel(String id) throws UnsupportedEncodingException, XMLStreamException {
-//        ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(id).singleResult();
-//        InputStream bpmnStream = repositoryService.getResourceAsStream(processDefinition.getDeploymentId(),
-//                processDefinition.getResourceName());
-//        XMLInputFactory xif = XMLInputFactory.newInstance();
-//        InputStreamReader in = new InputStreamReader(bpmnStream, "UTF-8");
-//        XMLStreamReader xtr = xif.createXMLStreamReader(in);
-//        BpmnModel bpmnModel = new BpmnXMLConverter().convertToBpmnModel(xtr);
-//
-//        BpmnJsonConverter converter = new BpmnJsonConverter();
-//        ObjectNode modelNode = converter.convertToJson(bpmnModel);
-//        Model modelData = repositoryService.newModel();
-//        modelData.setKey(processDefinition.getKey());
-//        modelData.setName(processDefinition.getResourceName());
-//        modelData.setCategory(processDefinition.getCategory());
-//        modelData.setDeploymentId(processDefinition.getDeploymentId());
-//        modelData.setVersion(Integer.parseInt(String.valueOf(repositoryService.createModelQuery().modelKey(modelData.getKey()).count()+1)));
-//
-//        ObjectNode modelObjectNode = new ObjectMapper().createObjectNode();
-//        modelObjectNode.put(ModelDataJsonConstants.MODEL_NAME, processDefinition.getName());
-//        modelObjectNode.put(ModelDataJsonConstants.MODEL_REVISION, modelData.getVersion());
-//        modelObjectNode.put(ModelDataJsonConstants.MODEL_DESCRIPTION, processDefinition.getDescription());
-//        modelData.setMetaInfo(modelObjectNode.toString());
-//
-//        repositoryService.saveModel(modelData);
-//
-//        repositoryService.addModelEditorSource(modelData.getId(), modelNode.toString().getBytes("utf-8"));
-//
-//        return modelData;
-//    }
+    /**
+     * 将部署的流程转换为模型
+     * @param id 流程ID
+     */
+    public Model convertToModel(String id) throws UnsupportedEncodingException, XMLStreamException {
+        ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(id).singleResult();
+        InputStream bpmnStream = repositoryService.getResourceAsStream(processDefinition.getDeploymentId(),
+                processDefinition.getResourceName());
+        XMLInputFactory xif = XMLInputFactory.newInstance();
+        InputStreamReader in = new InputStreamReader(bpmnStream, "UTF-8");
+        XMLStreamReader xtr = xif.createXMLStreamReader(in);
+        BpmnModel bpmnModel = new BpmnXMLConverter().convertToBpmnModel(xtr);
+
+        BpmnJsonConverter converter = new BpmnJsonConverter();
+        ObjectNode modelNode = converter.convertToJson(bpmnModel);
+        Model modelData = repositoryService.newModel();
+        modelData.setKey(processDefinition.getKey());
+        modelData.setName(processDefinition.getResourceName());
+        modelData.setCategory(processDefinition.getCategory());
+        modelData.setDeploymentId(processDefinition.getDeploymentId());
+        modelData.setVersion(Integer.parseInt(String.valueOf(repositoryService.createModelQuery().modelKey(modelData.getKey()).count()+1)));
+
+        ObjectNode modelObjectNode = new ObjectMapper().createObjectNode();
+        modelObjectNode.put(ModelDataJsonConstants.MODEL_NAME, processDefinition.getName());
+        modelObjectNode.put(ModelDataJsonConstants.MODEL_REVISION, modelData.getVersion());
+        modelObjectNode.put(ModelDataJsonConstants.MODEL_DESCRIPTION, processDefinition.getDescription());
+        modelData.setMetaInfo(modelObjectNode.toString());
+
+        repositoryService.saveModel(modelData);
+
+        repositoryService.addModelEditorSource(modelData.getId(), modelNode.toString().getBytes("utf-8"));
+
+        return modelData;
+    }
 
     /**
      * 删除部署
-     *
-     * @param deploymentId 部署ID
+     * @param deploymentId  部署ID
      */
-    public void deleteDeployment(String deploymentId) {
+    public void deleteDeployment(String deploymentId){
         repositoryService.deleteDeployment(deploymentId, true);
     }
 
     /**
      * 获取资源文件
-     *
-     * @param deploymentId 部署ID
+     * @param deploymentId  部署ID
      * @param resourceName 资源名称
      */
     public InputStream getResourceAsStream(String deploymentId, String resourceName) {
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/ActRunningService.java b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/ActRunningService.java
old mode 100644
new mode 100755
index 4ea48bab6..000500ce6
--- a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/ActRunningService.java
+++ b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/ActRunningService.java
@@ -1,8 +1,8 @@
 /**
  * Copyright (c) 2018 人人开源 All rights reserved.
- *
+ * <p>
  * https://www.renren.io
- *
+ * <p>
  * 版权所有，侵权必究！
  */
 
@@ -37,24 +37,24 @@ public class ActRunningService {
      * 流程定义列表
      */
     public PageData<Map<String, Object>> page(Map<String, Object> params) {
-        String id = (String)params.get("id");
-        String definitionKey = (String)params.get("definitionKey");
+        String id = (String) params.get("id");
+        String definitionKey = (String) params.get("definitionKey");
 
         //分页参数
         Integer curPage = 1;
         Integer limit = 10;
-        if(params.get(Constant.PAGE) != null){
-            curPage = Integer.parseInt((String)params.get(Constant.PAGE));
+        if (params.get(Constant.PAGE) != null) {
+            curPage = Integer.parseInt((String) params.get(Constant.PAGE));
         }
-        if(params.get(Constant.LIMIT) != null){
-            limit = Integer.parseInt((String)params.get(Constant.LIMIT));
+        if (params.get(Constant.LIMIT) != null) {
+            limit = Integer.parseInt((String) params.get(Constant.LIMIT));
         }
 
         ProcessInstanceQuery processInstanceQuery = runtimeService.createProcessInstanceQuery();
-        if (StringUtils.isNotBlank(id)){
+        if (StringUtils.isNotBlank(id)) {
             processInstanceQuery.processInstanceId(id);
         }
-        if (StringUtils.isNotBlank(definitionKey)){
+        if (StringUtils.isNotBlank(definitionKey)) {
             processInstanceQuery.processDefinitionKey(definitionKey);
         }
 
@@ -63,7 +63,7 @@ public class ActRunningService {
         for (ProcessInstance processInstance : processInstanceList) {
             objectList.add(processInstanceConvert(processInstance));
         }
-        return new PageData<>(objectList, (int)processInstanceQuery.count());
+        return new PageData<>(objectList, (int) processInstanceQuery.count());
     }
 
     /**
@@ -86,7 +86,7 @@ public class ActRunningService {
      * 删除实例
      * @param id  实例ID
      */
-    public void delete(String id){
+    public void delete(String id) {
         runtimeService.deleteProcessInstance(id, null);
     }
 
@@ -94,7 +94,7 @@ public class ActRunningService {
      * 启动流程实例
      * @param key 流程定义标识key
      */
-    public void startProcess(String key){
+    public void startProcess(String key) {
         runtimeService.startProcessInstanceByKey(key);
     }
 }
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/ActWorkflowCommonService.java b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/ActWorkflowCommonService.java
deleted file mode 100644
index 2db005979..000000000
--- a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/ActWorkflowCommonService.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.elink.esua.epdc.service;
-
-/**
- * activiti工作流
- *
- * @author yujintao
- * @email yujintao@elink-cn.com
- * @date 2019/9/3 11:18
- */
-public interface ActWorkflowCommonService {
-
-    /**
-     * 启动流程并绑定任务
-     *
-     * @param processKey  流程ID
-     * @param businessKey 任务ID
-     * @param deptId      部门ID（通过部门ID，判断是否有权限审核任务）
-     * @return boolean
-     * @author yujintao
-     * @date 2019/9/3 13:58
-     */
-    boolean startProcess(String processKey, String businessKey, String deptId);
-
-}
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/impl/ActIdServiceImpl.java b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/impl/ActIdServiceImpl.java
deleted file mode 100644
index b98189d60..000000000
--- a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/impl/ActIdServiceImpl.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.elink.esua.epdc.service.impl;
-
-import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.form.ActGroupFormDto;
-import com.elink.esua.epdc.dto.form.ActUserFormDto;
-import com.elink.esua.epdc.service.ActIdService;
-import org.activiti.engine.IdentityService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * 流程用户服务实现类
- *
- * @author rongchao
- * @Date 19-9-6
- */
-@Service
-public class ActIdServiceImpl implements ActIdService {
-
-    @Autowired
-    private IdentityService identityService;
-
-    @Override
-    public Result<String> saveUser(ActUserFormDto actUserFormDto) {
-        return null;
-    }
-
-    @Override
-    public Result<String> saveGroup(ActGroupFormDto actGroupFormDto) {
-        return null;
-    }
-
-    @Override
-    public Result<String> modifyGroupName(String newGroupName) {
-        return new Result<String>().ok("success");
-    }
-}
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/impl/ActWorkflowCommonServiceImpl.java b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/impl/ActWorkflowCommonServiceImpl.java
deleted file mode 100644
index 8c1dee237..000000000
--- a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/impl/ActWorkflowCommonServiceImpl.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.elink.esua.epdc.service.impl;
-
-import com.elink.esua.epdc.service.ActWorkflowCommonService;
-import com.google.common.collect.Maps;
-import org.activiti.engine.HistoryService;
-import org.activiti.engine.RepositoryService;
-import org.activiti.engine.RuntimeService;
-import org.activiti.engine.TaskService;
-import org.activiti.engine.runtime.ProcessInstance;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.web.context.ContextLoader;
-import org.springframework.web.context.WebApplicationContext;
-
-import java.util.HashMap;
-import java.util.Map;
-
-
-/**
- * @author yujintao
- * @email yujintao@elink-cn.com
- * @date 2019/9/3 11:19
- */
-@Service
-public class ActWorkflowCommonServiceImpl implements ActWorkflowCommonService {
-
-    @Autowired
-    private RepositoryService repositoryService;
-
-    @Autowired
-    private RuntimeService runtimeService;
-
-    @Autowired
-    private TaskService taskService;
-
-    @Autowired
-    private HistoryService historyService;
-
-    @Override
-    public boolean startProcess(String processKey, String businessKey, String deptId) {
-        Map<String, Object> map = Maps.newHashMap();
-        map.put("deptId", deptId);
-        map.put("activityId", "_2");
-        //使用正在执行对象表中的一个字段BUSINESS_KEY(Activiti提供的一个字段)，让启动的流程（流程实例）关联业务
-        runtimeService.startProcessInstanceByKey(processKey, businessKey, map);
-        return true;
-    }
-
-
-}
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/utils/ModuleConstant.java b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/utils/ModuleConstant.java
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/application.yml
old mode 100644
new mode 100755
index 71c68d4ea..8aaea7dc4
--- a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 server:
-  port: @server.port@
+  port: 8106
   servlet:
     context-path: /activiti
 
@@ -16,11 +16,10 @@ spring:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
   activiti:
-    check-process-definitions: true
-    database-schema-update: false
-    process-definition-location-prefix: classpath:/processes/
+    check-process-definitions: false
+    database-schema-update: true
   redis:
-    database: 2
+    database: 0
     host: 47.104.224.45
     timeout: 30s
     port: 6379
@@ -28,27 +27,24 @@ spring:
   datasource:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
-      url: jdbc:mysql://47.104.224.45:3308/epdc_activiti?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
-      username: root
-      password: shibei@888
+      url: jdbc:mysql://47.104.224.45:3308/esua_epdc_activiti?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false
+      username: epdc
+      password: elink833066
   cloud:
     nacos:
       discovery:
-        server-addr: @nacos.server-addr@
-        register-enabled: @nacos.register-enabled@
-    alibaba:
-      seata:
-        tx-service-group: epdc-activiti-server-fescar-service-group
+        server-addr: 47.104.224.45:8848
+        register-enabled: true
       #Oracle
-      #      driver-class-name: oracle.jdbc.OracleDriver
-      #      url: jdbc:oracle:thin:@localhost:1521:xe
-      #      username: renren_cloud
-      #      password: 123456
+#      driver-class-name: oracle.jdbc.OracleDriver
+#      url: jdbc:oracle:thin:@localhost:1521:xe
+#      username: renren_cloud
+#      password: 123456
       #SQLServer
-      #      driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-      #      url: jdbc:sqlserver://localhost:1433;DatabaseName=renren_cloud
-      #      username: sa
-      #      password: 123456
+#      driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+#      url: jdbc:sqlserver://localhost:1433;DatabaseName=renren_cloud
+#      username: sa
+#      password: 123456
       #postgresql
 #      driver-class-name: org.postgresql.Driver
 #      url: jdbc:postgresql://localhost:5432/renren_cloud
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/i18n/messages.properties b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/i18n/messages.properties
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/i18n/messages_en_US.properties b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/i18n/messages_en_US.properties
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/i18n/messages_zh_CN.properties b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/i18n/messages_zh_CN.properties
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/i18n/messages_zh_TW.properties b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/i18n/messages_zh_TW.properties
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/i18n/validation.properties b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/i18n/validation.properties
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/i18n/validation_en_US.properties b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/i18n/validation_en_US.properties
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/i18n/validation_zh_CN.properties b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/i18n/validation_zh_CN.properties
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/i18n/validation_zh_TW.properties b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/i18n/validation_zh_TW.properties
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/logback-spring.xml b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/logback-spring.xml
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/processes/favicon.ico b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/processes/favicon.ico
deleted file mode 100644
index 2bd581cea..000000000
Binary files a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/processes/favicon.ico and /dev/null differ
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/bg.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/bg.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/breadcrumbs.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/breadcrumbs.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/checker-bg.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/checker-bg.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/blue/message_catch.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/blue/message_catch.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/business_rule.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/business_rule.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/error_catch.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/error_catch.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/error_throw.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/error_throw.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/manual.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/manual.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/message_catch.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/message_catch.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/message_throw.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/message_throw.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/receive.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/receive.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/script.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/script.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/send.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/send.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/service.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/service.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/signal_catch.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/signal_catch.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/signal_throw.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/signal_throw.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/timer.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/timer.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/user.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/user.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/index.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/index.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/ActivitiRest.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/ActivitiRest.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/ActivityImpl.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/ActivityImpl.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/Color.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/Color.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/LineBreakMeasurer.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/LineBreakMeasurer.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/Polyline.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/Polyline.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/ProcessDiagramCanvas.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/ProcessDiagramCanvas.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/ProcessDiagramGenerator.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/ProcessDiagramGenerator.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/jquery/jquery.asyncqueue.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/jquery/jquery.asyncqueue.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/jquery/jquery.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/jquery/jquery.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/jquery/jquery.progressbar.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/jquery/jquery.progressbar.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/jstools.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/jstools.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/raphael.2.1.1.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/raphael.2.1.1.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/raphael.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/raphael.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/raphael_uncompressed.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/raphael_uncompressed.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/textlayout.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/textlayout.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/style.css b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/style.css
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/app-cfg.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/app-cfg.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/app.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/app.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-assignment-controller.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-assignment-controller.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-condition-expression-controller.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-condition-expression-controller.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-custom-controllers.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-custom-controllers.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-default-controllers.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-default-controllers.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-event-listeners-controller.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-event-listeners-controller.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-execution-listeners-controller.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-execution-listeners-controller.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-fields-controller.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-fields-controller.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-form-properties-controller.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-form-properties-controller.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-in-parameters-controller.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-in-parameters-controller.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-message-definitions-controller.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-message-definitions-controller.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-message-scope-controller.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-message-scope-controller.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-multiinstance-controller.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-multiinstance-controller.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-out-parameters-controller.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-out-parameters-controller.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-sequenceflow-order-controller.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-sequenceflow-order-controller.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-signal-definitions-controller.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-signal-definitions-controller.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-signal-scope-controller.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-signal-scope-controller.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-task-listeners-controller.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-task-listeners-controller.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/assignment-display-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/assignment-display-template.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/assignment-popup.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/assignment-popup.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/assignment-write-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/assignment-write-template.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/boolean-property-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/boolean-property-template.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/condition-expression-display-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/condition-expression-display-template.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/condition-expression-popup.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/condition-expression-popup.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/condition-expression-write-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/condition-expression-write-template.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/default-value-display-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/default-value-display-template.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/event-listeners-display-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/event-listeners-display-template.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/event-listeners-popup.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/event-listeners-popup.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/event-listeners-write-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/event-listeners-write-template.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/execution-listeners-display-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/execution-listeners-display-template.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/execution-listeners-popup.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/execution-listeners-popup.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/execution-listeners-write-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/execution-listeners-write-template.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/feedback-popup.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/feedback-popup.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/fields-display-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/fields-display-template.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/fields-popup.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/fields-popup.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/fields-write-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/fields-write-template.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/form-properties-display-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/form-properties-display-template.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/form-properties-popup.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/form-properties-popup.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/form-properties-write-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/form-properties-write-template.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/in-parameters-display-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/in-parameters-display-template.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/in-parameters-popup.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/in-parameters-popup.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/in-parameters-write-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/in-parameters-write-template.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/message-definitions-display-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/message-definitions-display-template.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/message-definitions-popup.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/message-definitions-popup.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/message-definitions-write-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/message-definitions-write-template.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/message-property-write-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/message-property-write-template.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/multiinstance-property-write-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/multiinstance-property-write-template.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/out-parameters-display-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/out-parameters-display-template.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/out-parameters-popup.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/out-parameters-popup.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/out-parameters-write-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/out-parameters-write-template.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/sequenceflow-order-display-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/sequenceflow-order-display-template.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/sequenceflow-order-popup.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/sequenceflow-order-popup.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/sequenceflow-order-write-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/sequenceflow-order-write-template.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/signal-definitions-display-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/signal-definitions-display-template.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/signal-definitions-popup.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/signal-definitions-popup.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/signal-definitions-write-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/signal-definitions-write-template.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/signal-property-write-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/signal-property-write-template.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/string-property-write-mode-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/string-property-write-mode-template.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/subprocess-reference-display-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/subprocess-reference-display-template.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/subprocess-reference-popup.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/subprocess-reference-popup.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/subprocess-reference-write-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/subprocess-reference-write-template.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/task-listeners-display-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/task-listeners-display-template.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/task-listeners-popup.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/task-listeners-popup.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/task-listeners-write-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/task-listeners-write-template.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/text-popup.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/text-popup.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/text-property-write-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/text-property-write-template.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/toolbar-custom-actions.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/toolbar-custom-actions.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/toolbar-default-actions.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/toolbar-default-actions.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/toolbar.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/toolbar.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/url-config.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/url-config.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/css/style-common.css b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/css/style-common.css
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/css/style-editor.css b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/css/style-editor.css
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/css/style.css b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/css/style.css
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/editor-config.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/editor-config.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/editor-controller.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/editor-controller.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/editor-utils.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/editor-utils.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/editor.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/editor.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/editor/css/editor.css b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/editor/css/editor.css
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/editor/i18n/translation_de.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/editor/i18n/translation_de.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/editor/i18n/translation_en_us.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/editor/i18n/translation_en_us.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/editor/i18n/translation_signavio_de.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/editor/i18n/translation_signavio_de.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/editor/i18n/translation_signavio_en_us.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/editor/i18n/translation_signavio_en_us.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/editor/oryx.debug.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/editor/oryx.debug.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/editor/oryx.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/editor/oryx.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/eventbus.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/eventbus.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/fonts/activiti-admin-webfont.eot b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/fonts/activiti-admin-webfont.eot
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/fonts/activiti-admin-webfont.svg b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/fonts/activiti-admin-webfont.svg
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/fonts/activiti-admin-webfont.ttf b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/fonts/activiti-admin-webfont.ttf
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/fonts/activiti-admin-webfont.woff b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/fonts/activiti-admin-webfont.woff
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/fonts/glyphicons-halflings-regular.eot b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/fonts/glyphicons-halflings-regular.eot
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/fonts/glyphicons-halflings-regular.svg b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/fonts/glyphicons-halflings-regular.svg
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/fonts/glyphicons-halflings-regular.ttf b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/fonts/glyphicons-halflings-regular.ttf
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/fonts/glyphicons-halflings-regular.woff b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/fonts/glyphicons-halflings-regular.woff
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/header-controller.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/header-controller.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/i18n/en.json b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/i18n/en.json
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/images/bpmn-error.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/images/bpmn-error.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/images/bpmn-warning.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/images/bpmn-warning.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/images/datadefinition.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/images/datadefinition.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/images/delete.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/images/delete.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/images/loading.gif b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/images/loading.gif
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/images/logo-2x.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/images/logo-2x.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/images/logo.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/images/logo.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/images/nw-handle-dark.gif b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/images/nw-handle-dark.gif
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/images/se-handle-dark.gif b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/images/se-handle-dark.gif
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/images/shapemenu_highlight.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/images/shapemenu_highlight.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/images/wrench.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/images/wrench.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-cookies_1.2.13/angular-cookies.min.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-cookies_1.2.13/angular-cookies.min.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-cookies_1.2.13/angular-cookies.min.js.map b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-cookies_1.2.13/angular-cookies.min.js.map
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-dragdrop.min-1.0.3.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-dragdrop.min-1.0.3.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-dragdrop_1.0.7/angular-dragdrop.min.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-dragdrop_1.0.7/angular-dragdrop.min.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-mocks_1.2.13/angular-mocks.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-mocks_1.2.13/angular-mocks.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-resource_1.2.13/angular-resource.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-resource_1.2.13/angular-resource.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-resource_1.2.13/angular-resource.min.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-resource_1.2.13/angular-resource.min.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-resource_1.2.13/angular-resource.min.js.map b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-resource_1.2.13/angular-resource.min.js.map
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-route_1.2.13/angular-route.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-route_1.2.13/angular-route.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-route_1.2.13/angular-route.min.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-route_1.2.13/angular-route.min.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-route_1.2.13/angular-route.min.js.map b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-route_1.2.13/angular-route.min.js.map
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-sanitize_1.2.13/angular-sanitize.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-sanitize_1.2.13/angular-sanitize.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-sanitize_1.2.13/angular-sanitize.min.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-sanitize_1.2.13/angular-sanitize.min.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-sanitize_1.2.13/angular-sanitize.min.js.map b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-sanitize_1.2.13/angular-sanitize.min.js.map
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-scroll_0.5.7/angular-scroll.min.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-scroll_0.5.7/angular-scroll.min.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-strap_2.0.5/angular-strap.min.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-strap_2.0.5/angular-strap.min.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-strap_2.0.5/angular-strap.tpl.min.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-strap_2.0.5/angular-strap.tpl.min.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-translate-loader-static-files/.bower.json b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-translate-loader-static-files/.bower.json
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-translate-loader-static-files/angular-translate-loader-static-files.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-translate-loader-static-files/angular-translate-loader-static-files.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-translate-loader-static-files/angular-translate-loader-static-files.min.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-translate-loader-static-files/angular-translate-loader-static-files.min.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-translate-storage-cookie/.bower.json b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-translate-storage-cookie/.bower.json
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-translate-storage-cookie/angular-translate-storage-cookie.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-translate-storage-cookie/angular-translate-storage-cookie.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-translate-storage-cookie/angular-translate-storage-cookie.min.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-translate-storage-cookie/angular-translate-storage-cookie.min.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-translate_2.4.2/angular-translate.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-translate_2.4.2/angular-translate.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-translate_2.4.2/angular-translate.min.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-translate_2.4.2/angular-translate.min.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular_1.2.13/angular-animate.min.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular_1.2.13/angular-animate.min.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular_1.2.13/angular.min.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular_1.2.13/angular.min.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap-daterangepicker_1.3.7/daterangepicker-bs3.css b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap-daterangepicker_1.3.7/daterangepicker-bs3.css
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap-daterangepicker_1.3.7/daterangepicker.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap-daterangepicker_1.3.7/daterangepicker.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/css/bootstrap-theme.css b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/css/bootstrap-theme.css
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/css/bootstrap-theme.css.map b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/css/bootstrap-theme.css.map
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/css/bootstrap-theme.min.css b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/css/bootstrap-theme.min.css
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/css/bootstrap.css b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/css/bootstrap.css
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/css/bootstrap.css.map b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/css/bootstrap.css.map
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/css/bootstrap.min.css b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/css/bootstrap.min.css
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/fonts/glyphicons-halflings-regular.eot b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/fonts/glyphicons-halflings-regular.eot
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/fonts/glyphicons-halflings-regular.svg b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/fonts/glyphicons-halflings-regular.svg
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/fonts/glyphicons-halflings-regular.ttf b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/fonts/glyphicons-halflings-regular.ttf
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/fonts/glyphicons-halflings-regular.woff b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/fonts/glyphicons-halflings-regular.woff
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/js/bootstrap.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/js/bootstrap.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/js/bootstrap.min.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/js/bootstrap.min.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/.bower.json b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/.bower.json
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/.gitignore b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/.gitignore
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/CHANGES b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/CHANGES
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/CONTRIBUTORS.md b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/CONTRIBUTORS.md
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/LICENSE b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/LICENSE
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/README.md b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/README.md
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/es5-sham.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/es5-sham.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/es5-sham.map b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/es5-sham.map
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/es5-sham.min.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/es5-sham.min.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/es5-shim.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/es5-shim.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/es5-shim.map b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/es5-shim.map
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/es5-shim.min.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/es5-shim.min.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/package.json b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/package.json
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/helpers/h-kill.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/helpers/h-kill.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/helpers/h-matchers.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/helpers/h-matchers.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/helpers/h.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/helpers/h.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/index.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/index.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/index.min.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/index.min.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/lib/jasmine-html.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/lib/jasmine-html.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/lib/jasmine.css b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/lib/jasmine.css
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/lib/jasmine.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/lib/jasmine.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/lib/jasmine_favicon.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/lib/jasmine_favicon.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/lib/json2.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/lib/json2.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-array.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-array.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-date.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-date.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-function.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-function.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-number.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-number.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-object.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-object.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-string.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-string.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/jquery-ui-1.10.3.custom.min.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/jquery-ui-1.10.3.custom.min.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/jquery.autogrow-textarea.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/jquery.autogrow-textarea.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/jquery_1.11.0/jquery.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/jquery_1.11.0/jquery.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/jquery_1.11.0/jquery.min.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/jquery_1.11.0/jquery.min.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/jquery_1.11.0/jquery.min.map b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/jquery_1.11.0/jquery.min.map
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/json3_3.2.6/LICENSE b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/json3_3.2.6/LICENSE
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/json3_3.2.6/lib/json3.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/json3_3.2.6/lib/json3.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/json3_3.2.6/lib/json3.min.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/json3_3.2.6/lib/json3.min.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/momentjs_2.5.1/momentjs.min.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/momentjs_2.5.1/momentjs.min.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/mousetrap-1.4.5.min.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/mousetrap-1.4.5.min.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/ng-grid-2.0.7-min.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/ng-grid-2.0.7-min.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/ng-grid-2.0.7.min.css b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/ng-grid-2.0.7.min.css
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/path_parser.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/path_parser.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/prototype-1.5.1.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/prototype-1.5.1.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/ui-utils.min-0.0.4.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/ui-utils.min-0.0.4.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/partials/root-stencil-item-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/partials/root-stencil-item-template.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/partials/stencil-item-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/partials/stencil-item-template.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/plugins.xml b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/plugins.xml
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/popups/icon-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/popups/icon-template.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/popups/save-model.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/popups/save-model.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/popups/select-shape.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/popups/select-shape.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/popups/unsaved-changes.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/popups/unsaved-changes.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/select-shape-controller.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/select-shape-controller.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencil-controller.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencil-controller.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/event.subprocess.collapsed.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/event.subprocess.collapsed.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/event.subprocess.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/event.subprocess.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/expanded.subprocess.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/expanded.subprocess.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.business.rule.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.business.rule.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.camel.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.camel.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.manual.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.manual.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.mule.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.mule.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.receive.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.receive.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.script.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.script.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.send.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.send.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.service.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.service.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.shell.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.shell.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.user.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.user.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/subprocess.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/subprocess.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/task.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/task.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/artifact/text.annotation.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/artifact/text.annotation.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/catching/cancel.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/catching/cancel.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/catching/compensation.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/catching/compensation.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/catching/error.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/catching/error.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/catching/message.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/catching/message.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/catching/signal.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/catching/signal.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/catching/timer.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/catching/timer.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/connector/association.undirected.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/connector/association.undirected.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/connector/association.unidirectional.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/connector/association.unidirectional.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/connector/messageflow.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/connector/messageflow.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/connector/sequenceflow.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/connector/sequenceflow.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/dataobject/data.store.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/dataobject/data.store.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/diagram.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/diagram.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/endevent/cancel.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/endevent/cancel.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/endevent/error.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/endevent/error.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/endevent/none.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/endevent/none.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/endevent/terminate.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/endevent/terminate.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/gateway/eventbased.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/gateway/eventbased.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/gateway/exclusive.databased.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/gateway/exclusive.databased.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/gateway/inclusive.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/gateway/inclusive.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/gateway/parallel.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/gateway/parallel.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/startevent/error.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/startevent/error.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/startevent/message.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/startevent/message.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/startevent/none.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/startevent/none.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/startevent/signal.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/startevent/signal.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/startevent/timer.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/startevent/timer.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/swimlane/lane.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/swimlane/lane.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/swimlane/pool.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/swimlane/pool.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/throwing/none.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/throwing/none.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/throwing/signal.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/throwing/signal.png
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/toolbar-controller.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/toolbar-controller.js
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/favicon.ico b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/favicon.ico
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/modeler.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/modeler.html
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/registry.conf b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/registry.conf
deleted file mode 100644
index 9cfedf9cc..000000000
--- a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/registry.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-registry {
-  # file 、nacos 、eureka、redis、zk、consul、etcd3、sofa
-  type = "nacos"
-
-  nacos {
-    serverAddr = "47.104.224.45"
-    namespace = "public"
-    cluster = "default"
-  }
-}
-
-config {
-  # file、nacos 、apollo、zk、consul、etcd3
-  type = "nacos"
-
-  nacos {
-    serverAddr = "47.104.224.45"
-    namespace = "public"
-    cluster = "default"
-  }
-}
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/stencilset.json b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/stencilset.json
old mode 100644
new mode 100755
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/test/java/com/elink/esua/epdc/ActivitiTest.java b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/test/java/com/elink/esua/epdc/ActivitiTest.java
deleted file mode 100644
index 5594c95e7..000000000
--- a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/test/java/com/elink/esua/epdc/ActivitiTest.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package com.elink.esua.epdc;
-
-import com.elink.esua.epdc.service.ActWorkflowCommonService;
-import com.google.common.collect.Maps;
-import org.activiti.engine.RuntimeService;
-import org.activiti.engine.TaskService;
-import org.activiti.engine.runtime.ProcessInstance;
-import org.activiti.engine.task.Task;
-import org.activiti.engine.task.TaskQuery;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author yujintao
- * @email yujintao@elink-cn.com
- * @date 2019/9/3 10:06
- */
-@RunWith(SpringRunner.class)
-@SpringBootTest
-public class ActivitiTest {
-
-    @Autowired
-    private ActWorkflowCommonService actWorkflowCommonService;
-
-    @Autowired
-    private TaskService taskService;
-
-    @Autowired
-    private RuntimeService runtimeService;
-
-    @Test
-    public void test() {
-        String processId = "demoTask";
-        // 启动一个任务流程
-        actWorkflowCommonService.startProcess(processId, "testBusinessKey3", "testDeptId");
-    }
-
-    @Test
-    public void test2() {
-        String processId = "demoTask";
-        String deptId = "testDeptId";
-        this.queryTask(processId, deptId);
-        /*
-            关联业务id：testBusinessKey
-            流程实例id：5001
-            任务id：5006
-            任务标识：_4
-            任务负责人：testDeptId
-            任务名称：初次审核
-            任务创建时间：Tue Sep 03 14:26:50 CST 2019
-        */
-    }
-
-    @Test
-    public void test3() {
-        Map<String, Object> map = Maps.newHashMap();
-        map.put("deptId", "testDeptId2");
-        taskService.complete("5006", map);
-    }
-
-    @Test
-    public void test4() {
-        String processId = "demoTask";
-        String deptId = "testDeptId2";
-        this.queryTask(processId, deptId);
-        /*
-            关联业务id：testBusinessKey
-            流程实例id：5001
-            任务id：7502
-            任务标识：_5
-            任务负责人：testDeptId2
-            任务名称：二次审核
-            任务创建时间：Tue Sep 03 14:49:29 CST 2019
-        */
-    }
-
-
-    private void queryTask(String processId, String deptId) {
-        //创建查询对象
-        TaskQuery taskQuery = taskService.createTaskQuery().taskAssignee(deptId).processDefinitionKey(processId);
-        //获取查询列表
-        List<Task> list = taskQuery.list();
-
-        for (Task task : list) {
-            //流程实例id
-            String processInstanceId = task.getProcessInstanceId();
-            //根据流程实例id找到流程实例对象
-            ProcessInstance processInstance = runtimeService
-                    .createProcessInstanceQuery()
-                    .processInstanceId(processInstanceId)
-                    .singleResult();
-            //从流程实例对象获取bussinesskey
-            String businessKey = processInstance.getBusinessKey();
-            //根据businessKey查询业务系统，获取相关的业务信息
-            System.out.println("关联业务id：" + businessKey);
-            System.out.println("流程实例id：" + task.getProcessInstanceId());
-            System.out.println("任务id：" + task.getId());
-            System.out.println("任务标识：" + task.getTaskDefinitionKey());
-            System.out.println("任务负责人：" + task.getAssignee());
-            System.out.println("任务名称：" + task.getName());
-            System.out.println("任务创建时间：" + task.getCreateTime());
-        }
-    }
-}
diff --git a/esua-epdc/epdc-module/epdc-activiti/pom.xml b/esua-epdc/epdc-module/epdc-activiti/pom.xml
old mode 100644
new mode 100755
index 8ff2c9453..84f4583be
--- a/esua-epdc/epdc-module/epdc-activiti/pom.xml
+++ b/esua-epdc/epdc-module/epdc-activiti/pom.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
 
-    <parent>
-        <groupId>com.esua.epdc</groupId>
-        <artifactId>epdc-module</artifactId>
-        <version>1.0.0</version>
-    </parent>
+	<parent>
+		<groupId>com.esua.epdc</groupId>
+		<artifactId>epdc-module</artifactId>
+		<version>1.0.0</version>
+	</parent>
 
-    <groupId>com.esua.epdc</groupId>
-    <artifactId>epdc-activiti</artifactId>
-    <packaging>pom</packaging>
+	<groupId>com.esua.epdc</groupId>
+	<artifactId>epdc-activiti</artifactId>
+	<packaging>pom</packaging>
 
-    <modules>
-        <module>epdc-activiti-client</module>
-        <module>epdc-activiti-server</module>
-    </modules>
+	<modules>
+		<module>epdc-activiti-client</module>
+		<module>epdc-activiti-server</module>
+	</modules>
 
 </project>
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/config/FeignRequestInterceptor.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/config/FeignRequestInterceptor.java
new file mode 100644
index 000000000..91146b3bb
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/config/FeignRequestInterceptor.java
@@ -0,0 +1,30 @@
+package com.elink.esua.epdc.config;
+
+import com.elink.esua.epdc.commons.tools.constant.Constant;
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Enumeration;
+
+/**
+ *
+ * feign转发header参数
+ *
+ * @Author：liuchuang
+ * @Date：2019/11/26 16:29
+ */
+@Configuration
+public class FeignRequestInterceptor implements RequestInterceptor {
+
+    @Override
+    public void apply(RequestTemplate template) {
+        ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        HttpServletRequest request = attributes.getRequest();
+        template.header(Constant.USER_KEY, request.getHeader(Constant.USER_KEY));
+    }
+}
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java
index 3acb8c0a7..3dc1c81e7 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java
@@ -230,17 +230,4 @@ public class ApiAppUserController {
         return appUserService.prepareCompleteUserInfo(tokenDto);
     }
 
-    /**
-     * @param tokenDto
-     * @param formDto
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
-     * @Author yinzuomei
-     * @Description 解除与网格的关联
-     * @Date 2019/11/22 14:16
-     **/
-    @PostMapping("removeGrid")
-    public Result removeGrid(@LoginUser TokenDto tokenDto, @RequestBody EpdcAppRemoveGridFormDTO formDto) {
-        ValidatorUtils.validateEntity(formDto);
-        return appUserService.removeGrid(tokenDto, formDto);
-    }
 }
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java
index 4b8d0a15d..fc2359dbe 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java
@@ -1,6 +1,5 @@
 package com.elink.esua.epdc.controller;
 
-import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.common.token.dto.WorkUserAuthorizationDTO;
 import com.elink.esua.epdc.common.token.dto.WorkUserLoginDTO;
 import com.elink.esua.epdc.commons.tools.utils.Result;
@@ -11,14 +10,12 @@ import com.elink.esua.epdc.dto.form.EpdcWorkAppUserMaTokenFormDTO;
 import com.elink.esua.epdc.service.WorkUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 工作端，用户登录，用户管理相关接口
@@ -34,11 +31,10 @@ public class ApiWorkUserController {
     private WorkUserService workUserService;
 
     /**
-     *
      * 工作端-获取token
      *
-     * @params [formDto]
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcWorkAppAuthorizationDTO>
+     * @params [formDto]
      * @author liuchuang
      * @since 2019/11/19 17:23
      */
@@ -49,11 +45,10 @@ public class ApiWorkUserController {
     }
 
     /**
-     *
      * 工作端-用户登录
      *
-     * @params [formDto]
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.common.token.dto.WorkUserAuthorizationDTO>
+     * @params [formDto]
      * @author liuchuang
      * @since 2019/11/19 23:03
      */
@@ -69,7 +64,7 @@ public class ApiWorkUserController {
      * @param formDto 用户Id
      * @return
      */
-    @GetMapping("residentDetail")
+    @GetMapping("swagger/residentDetail")
     public Result<EpdcResidentDetailResultDTO> residentDetail(EpdcResidentDetailFormDTO formDto) {
         ValidatorUtils.validateEntity(formDto);
         return workUserService.residentDetail(formDto);
@@ -81,7 +76,7 @@ public class ApiWorkUserController {
      * @param userId
      * @return
      */
-    @GetMapping("partyMemberDetail")
+    @GetMapping("swagger/partyMemberDetail")
     public Result<EpdcPartyMemberDetailDto> partyMemberDetail(String userId) {
         return workUserService.partyMemberDetail(userId);
     }
@@ -92,7 +87,7 @@ public class ApiWorkUserController {
      * @param formDTO
      * @return
      */
-    @PostMapping("authenticateResident")
+    @PostMapping("swagger/authenticateResident")
     public Result authenticateResident(@RequestBody EpdcAppAuthenticateResidentFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
         return workUserService.authenticateResident(formDTO);
@@ -101,13 +96,13 @@ public class ApiWorkUserController {
     /***
      * 用户列表
      * @param workUserFromDto
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List   <   com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO>>
      * @author qushutong
      * @date 2019/11/18 13:53
      */
     @GetMapping("list")
-    public Result<List<EpdcWorkUserResultDTO>> getUserList(@LoginUser TokenDto userDetail, EpdcWorkUserFromDTO workUserFromDto) {
-        return workUserService.listWorkUser(userDetail, workUserFromDto);
+    public Result<List<EpdcWorkUserResultDTO>> getUserList(EpdcWorkUserFromDTO workUserFromDto) {
+        return workUserService.listWorkUser(workUserFromDto);
     }
 
     /***
@@ -118,20 +113,20 @@ public class ApiWorkUserController {
      * @date 2019/11/19 10:54
      */
     @GetMapping("unauthorizedAmount")
-    public Result<Integer> unauthorizedAmount(@LoginUser TokenDto userDetail, EpdcUnauthorizedAmountFromDTO fromDto){
-        return workUserService.getUnauthorizedAmount(userDetail,fromDto);
+    public Result<Integer> unauthorizedAmount(EpdcUnauthorizedAmountFromDTO fromDto) {
+        return workUserService.getUnauthorizedAmount(fromDto);
     }
 
     /**
-     * @param userDetail
+     * 首页面板 获取工作端APP菜单
+     *
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcIndexPanelResultDTO>>
      * @Author yinzuomei
-     * @Description 首页面板 获取工作端APP菜单
      * @Date 2019/11/20 10:42
      **/
     @GetMapping("indexPanel")
-    public Result<List<EpdcAppIndexPanelResultDTO>> indexPanel(@LoginUser TokenDto userDetail) {
-        return workUserService.indexPanel(userDetail);
+    public Result<List<EpdcAppIndexPanelResultDTO>> indexPanel() {
+        return workUserService.indexPanel();
     }
 
     /**
@@ -141,9 +136,35 @@ public class ApiWorkUserController {
      * @Description 用户认证审核历史
      * @Date 2019/11/22 13:16
      **/
-    @GetMapping("authenticateHistory")
+    @GetMapping("swagger/authenticateHistory")
     public Result<List<EpdcAuthenticateHistoryResultDTO>> authenticateHistory(EpdcAuthenticateHistoryFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
         return workUserService.authenticateHistory(formDTO);
     }
+
+    /**
+     * 获取用户扫码的网格
+     *
+     * @param userId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO>>
+     * @author work@yujt.net.cn
+     * @date 2019/11/26 15:52
+     */
+    @GetMapping("swagger/listGrid")
+    public Result<List<EpdcUserGridResultDTO>> listUserGrid(String userId) {
+        return workUserService.listUserGrid(userId);
+    }
+
+    /**
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author yinzuomei
+     * @Description 解除与网格的关联
+     * @Date 2019/11/22 14:16
+     **/
+    @PostMapping("swagger/removeGrid")
+    public Result removeGrid(@RequestBody EpdcAppRemoveGridFormDTO formDto) {
+        ValidatorUtils.validateEntity(formDto);
+        return workUserService.removeGrid(formDto);
+    }
 }
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/OssFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/OssFeignClient.java
index 30d32c78f..875445a57 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/OssFeignClient.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/OssFeignClient.java
@@ -2,13 +2,12 @@ package com.elink.esua.epdc.feign;
 
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.UploadDTO;
 import com.elink.esua.epdc.dto.UploadFormDTO;
+import com.elink.esua.epdc.dto.UploadToOssDTO;
 import com.elink.esua.epdc.feign.fallback.OssFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 文件对象模块
@@ -35,8 +34,8 @@ public interface OssFeignClient {
      * @params [file]
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.UploadDTO>
      * @author liuchuang
-     * @since 2019/11/25 10:55
+     * @since 2019/11/25 16:13
      */
-    @PostMapping(value = "oss/file/upload")
-    Result<UploadDTO> upload(MultipartFile file);
+    @PostMapping(value = "oss/file/uploadFile", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<String> uploadFile(UploadToOssDTO uploadToOssDto);
 }
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java
index 485197c68..dfe2a598d 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java
@@ -284,7 +284,7 @@ public interface UserFeignClient {
      * @author qushutong
      * @date 2019/11/18 13:47
      */
-    @GetMapping("app-user/epdc-app/user/list")
+    @GetMapping("app-user/epdc-app/user/listForWork")
     Result<List<EpdcWorkUserResultDTO>> getWorkUserList(EpdcWorkUserFromDTO workUserFromDto);
 
 
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkIssueFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkIssueFeignClient.java
index 6e7af1e0b..550eb0eb7 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkIssueFeignClient.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkIssueFeignClient.java
@@ -2,6 +2,7 @@ package com.elink.esua.epdc.feign;
 
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.config.FeignRequestInterceptor;
 import com.elink.esua.epdc.dto.category.EventCategoryDTO;
 import com.elink.esua.epdc.dto.comment.form.WorkCommentReplyFormDTO;
 import com.elink.esua.epdc.dto.comment.result.WorkEventsCommentsDTO;
@@ -15,12 +16,11 @@ import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
 
-@FeignClient(name = ServiceConstant.EPDC_EVENTS_SERVER, fallback = WorkIssueFeignClientFallback.class)
+@FeignClient(name = ServiceConstant.EPDC_EVENTS_SERVER, fallback = WorkIssueFeignClientFallback.class, configuration = FeignRequestInterceptor.class)
 public interface WorkIssueFeignClient {
 
     /**
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkItemFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkItemFeignClient.java
index 35ad9442a..e2cff982d 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkItemFeignClient.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkItemFeignClient.java
@@ -2,17 +2,15 @@ package com.elink.esua.epdc.feign;
 
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.SysDeptDTO;
+import com.elink.esua.epdc.config.FeignRequestInterceptor;
 import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO;
 import com.elink.esua.epdc.dto.item.form.*;
 import com.elink.esua.epdc.dto.item.result.*;
-import com.elink.esua.epdc.feign.fallback.ItemFeignClientFallback;
 import com.elink.esua.epdc.feign.fallback.WorkItemFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
 
 import java.util.List;
 
@@ -21,7 +19,7 @@ import java.util.List;
  * @Author LPF
  * @Date 2019/11/18 16:39
  */
-@FeignClient(name = ServiceConstant.EPDC_EVENTS_SERVER, fallback = WorkItemFeignClientFallback.class)
+@FeignClient(name = ServiceConstant.EPDC_EVENTS_SERVER, fallback = WorkItemFeignClientFallback.class, configuration = FeignRequestInterceptor.class)
 public interface WorkItemFeignClient {
 
 
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/OssFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/OssFeignClientFallback.java
index e3c533f8a..8925de8fb 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/OssFeignClientFallback.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/OssFeignClientFallback.java
@@ -3,11 +3,10 @@ package com.elink.esua.epdc.feign.fallback;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.UploadDTO;
 import com.elink.esua.epdc.dto.UploadFormDTO;
+import com.elink.esua.epdc.dto.UploadToOssDTO;
 import com.elink.esua.epdc.feign.OssFeignClient;
 import org.springframework.stereotype.Component;
-import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 文件对象模块
@@ -23,7 +22,7 @@ public class OssFeignClientFallback implements OssFeignClient {
     }
 
     @Override
-    public Result<UploadDTO> upload(MultipartFile file) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_OSS_SERVER, "upload", file);
+    public Result<String> uploadFile(UploadToOssDTO uploadToOssDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_OSS_SERVER, "uploadFile", uploadToOssDto);
     }
 }
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java
index 0315165cf..4240885a0 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java
@@ -188,13 +188,4 @@ public interface AppUserService {
      */
     Result<EpdcCompleteUserInfoDTO> prepareCompleteUserInfo(TokenDto tokenDto);
 
-    /**
-     * @param tokenDto
-     * @param formDto
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
-     * @Author yinzuomei
-     * @Description 解除与网格的关联
-     * @Date 2019/11/22 14:17
-     **/
-    Result removeGrid(TokenDto tokenDto, EpdcAppRemoveGridFormDTO formDto);
 }
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkUserService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkUserService.java
index 5c9757cd9..5452cb9d7 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkUserService.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkUserService.java
@@ -19,47 +19,49 @@ import java.util.Map;
  */
 public interface WorkUserService {
 
-	/**
-	 *
-	 * 工作端-获取token
-	 *
-	 * @params [formDto]
-	 * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcWorkAppAuthorizationDTO>
-	 * @author liuchuang
-	 * @since 2019/11/19 17:28
-	 */
-	Result<WorkUserAuthorizationDTO> getMaToken(EpdcWorkAppUserMaTokenFormDTO formDto);
+    /**
+     * 工作端-获取token
+     *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcWorkAppAuthorizationDTO>
+     * @params [formDto]
+     * @author liuchuang
+     * @since 2019/11/19 17:28
+     */
+    Result<WorkUserAuthorizationDTO> getMaToken(EpdcWorkAppUserMaTokenFormDTO formDto);
+
+    /**
+     * 工作端-用户登录
+     *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.common.token.dto.WorkUserAuthorizationDTO>
+     * @params [formDto]
+     * @author liuchuang
+     * @since 2019/11/19 23:04
+     */
+    Result<WorkUserAuthorizationDTO> login(WorkUserLoginDTO formDto);
 
-	/**
-	 *
-	 * 工作端-用户登录
-	 *
-	 * @params [formDto]
-	 * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.common.token.dto.WorkUserAuthorizationDTO>
-	 * @author liuchuang
-	 * @since 2019/11/19 23:04
-	 */
-	Result<WorkUserAuthorizationDTO> login(WorkUserLoginDTO formDto);
+    /**
+     * 获取居民详情（已认证或待认证（提交信息待审核）的居民用户）
+     *
+     * @param formDto 用户Id
+     * @return
+     */
+    Result<EpdcResidentDetailResultDTO> residentDetail(EpdcResidentDetailFormDTO formDto);
 
-	/**
-	 * 获取居民详情（已认证或待认证（提交信息待审核）的居民用户）
-	 * @param formDto 用户Id
-	 * @return
-	 */
-	Result<EpdcResidentDetailResultDTO> residentDetail(EpdcResidentDetailFormDTO formDto);
-	/**
-	 * 认证用户（用户信息审核）
-	 * @param formDTO
-	 * @return
-	 */
-	Result authenticateResident(EpdcAppAuthenticateResidentFormDTO formDTO);
+    /**
+     * 认证用户（用户信息审核）
+     *
+     * @param formDTO
+     * @return
+     */
+    Result authenticateResident(EpdcAppAuthenticateResidentFormDTO formDTO);
 
-	/**
-	 * 获取党员详情（已认证或未认证的党员用户）
-	 * @param userId
-	 * @return
-	 */
-	Result<EpdcPartyMemberDetailDto> partyMemberDetail(String userId);
+    /**
+     * 获取党员详情（已认证或未认证的党员用户）
+     *
+     * @param userId
+     * @return
+     */
+    Result<EpdcPartyMemberDetailDto> partyMemberDetail(String userId);
 
     /***
      *  用户列表
@@ -68,32 +70,53 @@ public interface WorkUserService {
      * @author qushutong
      * @date 2019/11/18 13:39
      */
-    Result<List<EpdcWorkUserResultDTO>> listWorkUser(TokenDto userDetail, EpdcWorkUserFromDTO workUserFromDto);
+    Result<List<EpdcWorkUserResultDTO>> listWorkUser(EpdcWorkUserFromDTO workUserFromDto);
 
-	/***
-	 * 查询待认证用户数量
-	 * @param
-	 * @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.Integer>
-	 * @author qushutong
-	 * @date 2019/11/19 10:56
-	 */
-    Result<Integer> getUnauthorizedAmount(TokenDto userDetail,  EpdcUnauthorizedAmountFromDTO fromDto);
+    /**
+     * 查询待认证用户数量
+     *
+     * @param fromDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.Integer>
+     * @author qushutong
+     * @date 2019/11/19 10:56
+     */
+    Result<Integer> getUnauthorizedAmount(EpdcUnauthorizedAmountFromDTO fromDto);
+
+    /**
+     * 首页面板 获取工作端APP菜单
+     *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcIndexPanelResultDTO>>
+     * @Author yinzuomei
+     * @Date 2019/11/20 10:43
+     **/
+    Result<List<EpdcAppIndexPanelResultDTO>> indexPanel();
 
-	/**
-	 * @param userDetail
-	 * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcIndexPanelResultDTO>>
-	 * @Author yinzuomei
-	 * @Description 首页面板 获取工作端APP菜单
-	 * @Date 2019/11/20 10:43
-	 **/
-	Result<List<EpdcAppIndexPanelResultDTO>> indexPanel(TokenDto userDetail);
+    /**
+     * @param formDTO
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcAuthenticateHistoryResultDTO>>
+     * @Author yinzuomei
+     * @Description 用户认证审核历史
+     * @Date 2019/11/22 13:16
+     **/
+    Result<List<EpdcAuthenticateHistoryResultDTO>> authenticateHistory(EpdcAuthenticateHistoryFormDTO formDTO);
+
+    /**
+     * 获取用户扫码的网格
+     *
+     * @param userId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO>>
+     * @author work@yujt.net.cn
+     * @date 2019/11/26 15:52
+     */
+    Result<List<EpdcUserGridResultDTO>> listUserGrid(String userId);
 
-	/**
-	 * @param formDTO
-	 * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcAuthenticateHistoryResultDTO>>
-	 * @Author yinzuomei
-	 * @Description 用户认证审核历史
-	 * @Date 2019/11/22 13:16
-	 **/
-	Result<List<EpdcAuthenticateHistoryResultDTO>> authenticateHistory(EpdcAuthenticateHistoryFormDTO formDTO);
+    /**
+     * 解除与网格的关联
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author yinzuomei
+     * @Date 2019/11/22 14:17
+     **/
+    Result removeGrid(EpdcAppRemoveGridFormDTO formDto);
 }
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
index 0a6d5ca15..c3858c5a6 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
@@ -748,21 +748,6 @@ public class AppUserServiceImpl implements AppUserService {
         return new Result().error("获取用户信息失败");
     }
 
-    /**
-     * @param tokenDto
-     * @param formDto
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
-     * @Author yinzuomei
-     * @Description 解除与网格的关联
-     * @Date 2019/11/22 14:17
-     **/
-    @Override
-    public Result removeGrid(TokenDto tokenDto, EpdcAppRemoveGridFormDTO formDto) {
-        formDto.setCurrentLoginGrid(tokenDto.getGridId());
-        formDto.setUserId(tokenDto.getUserId());
-        return userFeignClient.removeGrid(formDto);
-    }
-
     /**
      * 组装个人完善信息对象
      *
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/TopicServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/TopicServiceImpl.java
index 5595bf477..6c657298d 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/TopicServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/TopicServiceImpl.java
@@ -4,6 +4,7 @@ import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.CompleteDeptDTO;
 import com.elink.esua.epdc.dto.UploadDTO;
+import com.elink.esua.epdc.dto.UploadToOssDTO;
 import com.elink.esua.epdc.dto.enums.TopicStateEnum;
 import com.elink.esua.epdc.dto.group.result.TopicAuditRecordResultDTO;
 import com.elink.esua.epdc.dto.topic.form.TopicChangeToIssueFormDTO;
@@ -116,11 +117,20 @@ public class TopicServiceImpl implements TopicService {
 
     @Override
     public Result<String> uploadImage(MultipartFile file) {
-        Result<UploadDTO> result = ossFeignClient.upload(file);
-        if (!result.success()) {
-            return new Result<String>().error(result.getMsg());
+        if (null == file) {
+            return new Result<String>().error("上传文件不能为空");
         }
 
-        return new Result<String>().ok(result.getData().getUrl());
+        try {
+            UploadToOssDTO uploadToOssDto = new UploadToOssDTO();
+            uploadToOssDto.setFileByte(file.getBytes());
+            uploadToOssDto.setFileName(file.getOriginalFilename());
+
+            return ossFeignClient.uploadFile(uploadToOssDto);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return new Result<String>().error("上传文件失败");
     }
 }
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkItemServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkItemServiceImpl.java
index c54b9b2b0..f78a49a45 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkItemServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkItemServiceImpl.java
@@ -1,12 +1,9 @@
 package com.elink.esua.epdc.service.impl;
 
-import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.SysDeptDTO;
 import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO;
 import com.elink.esua.epdc.dto.item.form.*;
 import com.elink.esua.epdc.dto.item.result.*;
-import com.elink.esua.epdc.feign.ItemFeignClient;
 import com.elink.esua.epdc.feign.WorkItemFeignClient;
 import com.elink.esua.epdc.service.WorkItemService;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java
index 2dc9c6a28..f2a1507a5 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java
@@ -6,6 +6,8 @@ import com.elink.esua.epdc.common.token.dto.WorkUserLoginDTO;
 import com.elink.esua.epdc.common.token.dto.WorkUserTokenFormDTO;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
+import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
+import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.SysUserDTO;
@@ -110,21 +112,25 @@ public class WorkUserServiceImpl implements WorkUserService {
      * 获取用户待审核列表
      * @param userDetail
      * @param workUserFromDto
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO>>
      * @author qushutong
      * @date 2019/11/19 10:00
      */
     @Override
-    public Result<List<EpdcWorkUserResultDTO>> listWorkUser(TokenDto userDetail, EpdcWorkUserFromDTO workUserFromDto) {
-        workUserFromDto.setUserId(userDetail.getUserId());
-        workUserFromDto.setDeptId(userDetail.getGridId());
+    public Result<List<EpdcWorkUserResultDTO>> listWorkUser(EpdcWorkUserFromDTO workUserFromDto) {
+        if (null == workUserFromDto.getGridId()) {
+            UserDetail user = SecurityUser.getUser();
+            workUserFromDto.setGridIdList(user.getDeptIdList());
+        }
         return userFeignClient.getWorkUserList(workUserFromDto);
     }
 
     @Override
-    public Result<Integer> getUnauthorizedAmount(TokenDto userDetail, EpdcUnauthorizedAmountFromDTO fromDto) {
-        fromDto.setDeptId(userDetail.getGridId());
-        fromDto.setUserId(userDetail.getUserId());
+    public Result<Integer> getUnauthorizedAmount(EpdcUnauthorizedAmountFromDTO fromDto) {
+        if (null == fromDto.getGridId()) {
+            UserDetail user = SecurityUser.getUser();
+            fromDto.setGridIdList(user.getDeptIdList());
+        }
         return userFeignClient.getUnauthorizedAmount(fromDto);
     }
 
@@ -159,11 +165,12 @@ public class WorkUserServiceImpl implements WorkUserService {
      * @Date 2019/11/20 10:43
      **/
     @Override
-    public Result<List<EpdcAppIndexPanelResultDTO>> indexPanel(TokenDto userDetail) {
-        if (null == userDetail || StringUtils.isBlank(userDetail.getMobile())) {
+    public Result<List<EpdcAppIndexPanelResultDTO>> indexPanel() {
+        String mobile = SecurityUser.getUser().getMobile();
+        if (StringUtils.isBlank(mobile)) {
             return new Result().error("获取用户信息失败");
         }
-        return adminFeignClient.indexPanel(userDetail.getMobile());
+        return adminFeignClient.indexPanel(mobile);
     }
 
     /**
@@ -178,4 +185,21 @@ public class WorkUserServiceImpl implements WorkUserService {
         return userFeignClient.authenticateHistory(formDTO);
     }
 
+    @Override
+    public Result<List<EpdcUserGridResultDTO>> listUserGrid(String userId) {
+        return userFeignClient.listUserGrid(userId);
+    }
+
+    /**
+     * 解除与网格的关联
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author yinzuomei
+     * @Date 2019/11/22 14:17
+     **/
+    @Override
+    public Result removeGrid(EpdcAppRemoveGridFormDTO formDto) {
+        return userFeignClient.removeGrid(formDto);
+    }
 }
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application.yml
index 507eed358..eb99e115b 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application.yml
@@ -58,6 +58,7 @@ hystrix:
     default:
       execution:
         isolation:
+          strategy: SEMAPHORE
           thread:
             timeoutInMilliseconds: 60000 #缺省为1000
 
diff --git a/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/pom.xml b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/pom.xml
index ad41b113f..74a2db545 100644
--- a/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/pom.xml
@@ -12,6 +12,11 @@
     <artifactId>epdc-demo-server</artifactId>
     <packaging>jar</packaging>
 
+    <properties>
+        <docker.repostory>47.104.85.99:9003</docker.repostory>
+        <dockerfile-maven-plugin.version>1.4.13</dockerfile-maven-plugin.version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>com.esua.epdc</groupId>
@@ -79,9 +84,37 @@
                     <skipTests>true</skipTests>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>com.spotify</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
+                <artifactId>dockerfile-maven-plugin</artifactId>
+                <version>${dockerfile-maven-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>default</id>
+                        <goals>
+                            <!--如果package时不想用docker打包,就注释掉这个goal-->
+                            <goal>build</goal>
+                            <goal>push</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <username>admin</username>
+                    <password>elink888</password>
+                    <repository>47.104.85.99:9002/repository/docker-private/</repository>
+                    <tag>latest</tag>
+                    <buildArgs>
+                        <!--提供参数向Dockerfile传递-->
+                        <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
+                    </buildArgs>
+                </configuration>
             </plugin>
         </plugins>
     </build>
diff --git a/esua-epdc/epdc-module/epdc-events/db/esua_epdc_events.pdman.json b/esua-epdc/epdc-module/epdc-events/db/esua_epdc_events.pdman.json
index 63dbb148a..65fe84ba5 100644
--- a/esua-epdc/epdc-module/epdc-events/db/esua_epdc_events.pdman.json
+++ b/esua-epdc/epdc-module/epdc-events/db/esua_epdc_events.pdman.json
@@ -5,119 +5,13 @@
       "chnname": "逆向解析_MYSQL",
       "entities": [
         {
-          "title": "EPDC_DEPT_KPI_CONFIG",
-          "chnname": "计分规则配置",
+          "title": "EPDC_CATEGORY",
+          "chnname": "分类管理",
           "fields": [
             {
               "name": "ID",
-              "type": "VARCHAR_32",
-              "chnname": "ID",
-              "remark": "",
-              "pk": true,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "KPI_ITEM_CODE",
-              "type": "VARCHAR_32",
-              "chnname": "绩效指标编码",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "KPI_ITEM_VALUE",
-              "type": "INT_10",
-              "chnname": "绩效指标值",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "KPI_ITEM_DESC",
-              "type": "VARCHAR_32",
-              "chnname": "绩效指标描述",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "DEL_FLAG",
-              "type": "VARCHAR_2",
-              "chnname": "删除标识 0：未删除，1：删除",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "REVISION",
-              "type": "INT_10",
-              "chnname": "乐观锁",
-              "remark": "",
-              "pk": false,
-              "notNull": false,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "CREATED_BY",
-              "type": "VARCHAR_32",
-              "chnname": "创建人",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "CREATED_TIME",
-              "type": "DATETIME",
-              "chnname": "创建时间",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "UPDATED_BY",
-              "type": "VARCHAR_32",
-              "chnname": "更新人",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "UPDATED_TIME",
-              "type": "DATETIME",
-              "chnname": "更新时间",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            }
-          ]
-        },
-        {
-          "title": "EPDC_DEPT_RESPOND_LOG",
-          "chnname": "部门响应记录",
-          "fields": [
-            {
-              "name": "ID",
-              "type": "VARCHAR_32",
-              "chnname": "ID",
+              "type": "BIGINT_19",
+              "chnname": "id",
               "remark": "",
               "pk": true,
               "notNull": true,
@@ -125,39 +19,9 @@
               "defaultValue": ""
             },
             {
-              "name": "REFERENCE_ID",
-              "type": "VARCHAR_32",
-              "chnname": "引用ID",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "REFERENCE_TYPE",
-              "type": "VARCHAR_32",
-              "chnname": "引用类型 issue或item或event",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "RESPOND_DEPT_ID",
+              "name": "PID",
               "type": "BIGINT_19",
-              "chnname": "响应部门的id（被呼叫的部门即审核部门）",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "RESPOND_TIME",
-              "type": "DATETIME",
-              "chnname": "响应时间即审核时间",
+              "chnname": "上级分类ID",
               "remark": "",
               "pk": false,
               "notNull": false,
@@ -165,9 +29,9 @@
               "defaultValue": ""
             },
             {
-              "name": "RESPOND_TYPE",
-              "type": "INT_10",
-              "chnname": "响应类型，参考枚举类DeptRespondTypeEnum",
+              "name": "PIDS",
+              "type": "VARCHAR_500",
+              "chnname": "所有上级分类ID，用逗号分开",
               "remark": "",
               "pk": false,
               "notNull": false,
@@ -175,19 +39,9 @@
               "defaultValue": ""
             },
             {
-              "name": "DEL_FLAG",
-              "type": "VARCHAR_2",
-              "chnname": "删除标识 0：未删除，1：删除",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "REVISION",
-              "type": "INT_10",
-              "chnname": "乐观锁",
+              "name": "CATEGORY_NAME",
+              "type": "VARCHAR_50",
+              "chnname": "分类名称",
               "remark": "",
               "pk": false,
               "notNull": false,
@@ -195,85 +49,19 @@
               "defaultValue": ""
             },
             {
-              "name": "CREATED_BY",
-              "type": "VARCHAR_32",
-              "chnname": "创建人",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "CREATED_TIME",
-              "type": "DATETIME",
-              "chnname": "创建时间",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "UPDATED_BY",
-              "type": "VARCHAR_32",
-              "chnname": "更新人",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "UPDATED_TIME",
-              "type": "DATETIME",
-              "chnname": "更新时间",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "RESPOND_FLAG",
-              "type": "VARCHAR_1",
-              "chnname": "是否被响应 0 否 1是",
+              "name": "CATEGORY_CODE",
+              "type": "VARCHAR_255",
+              "chnname": "分类编码",
               "remark": "",
               "pk": false,
               "notNull": false,
               "autoIncrement": false,
               "defaultValue": ""
-            }
-          ]
-        },
-        {
-          "title": "EPDC_DEPT_RESPOND_TIME_CONFIG",
-          "chnname": "绩效考核时间规则表",
-          "fields": [
-            {
-              "name": "ID",
-              "type": "VARCHAR_32",
-              "chnname": "ID",
-              "remark": "",
-              "pk": true,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "CATEGORY_ID",
-              "type": "VARCHAR_32",
-              "chnname": "议题或项目类别ID(不可重复)",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
             },
             {
-              "name": "CATEGORY_NAME",
-              "type": "VARCHAR_32",
-              "chnname": "类别名称",
+              "name": "CATEGORY_TYPE",
+              "type": "VARCHAR_50",
+              "chnname": "分类类别",
               "remark": "",
               "pk": false,
               "notNull": false,
@@ -281,109 +69,19 @@
               "defaultValue": ""
             },
             {
-              "name": "GRID_VALID_RESP_LIMIT_HOUR",
-              "type": "INT_10",
-              "chnname": "网格长在多少小时内响应算是有效响应",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "GRID_VALID_CLOSE_LIMIT_HOUR",
-              "type": "INT_10",
-              "chnname": "网格长在多少小时内关闭算是有效关闭",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "COMM_VALID_RESP_LIMIT_HOUR",
-              "type": "INT_10",
-              "chnname": "社区在多少小时内响应算是有效响应",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "STREET_VALID_RESP_LIMIT_HOUR",
-              "type": "INT_10",
-              "chnname": "街道在多少小时内响应算是有效响应",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "DISTRICT_VALID_RESP_LIMIT_HOUR",
-              "type": "INT_10",
-              "chnname": "区直在多少小时内响应算是有效响应",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "INVALID_RESP_LIMIT_HOUR",
-              "type": "INT_10",
-              "chnname": "超过多少小时响应算是无效响应。此值应大于各部门的有效响应值。若响应发生在有效响应与无效响应之间，为超时响应。",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "VALID_RESP_COEFFICIENT",
-              "type": "DECIMAL_5_1",
-              "chnname": "有效响应系数",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "OVERTIME_RESP_COEFFICIENT",
-              "type": "DECIMAL_5_1",
-              "chnname": "超时响应系数",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "INVALID_RESP_COEFFICIENT",
-              "type": "DECIMAL_5_1",
-              "chnname": "无效响应系数",
+              "name": "SORT",
+              "type": "INT UNSIGNED_10",
+              "chnname": "排序",
               "remark": "",
               "pk": false,
-              "notNull": true,
+              "notNull": false,
               "autoIncrement": false,
               "defaultValue": ""
             },
             {
               "name": "DEL_FLAG",
-              "type": "VARCHAR_2",
-              "chnname": "删除标识 0：未删除，1：删除",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "REVISION",
-              "type": "INT_10",
-              "chnname": "乐观锁",
+              "type": "TINYINT UNSIGNED_3",
+              "chnname": "删除标识  0：未删除    1：删除",
               "remark": "",
               "pk": false,
               "notNull": false,
@@ -391,42 +89,42 @@
               "defaultValue": ""
             },
             {
-              "name": "CREATED_BY",
-              "type": "VARCHAR_32",
-              "chnname": "创建人",
+              "name": "CREATOR",
+              "type": "BIGINT_19",
+              "chnname": "创建者",
               "remark": "",
               "pk": false,
-              "notNull": true,
+              "notNull": false,
               "autoIncrement": false,
               "defaultValue": ""
             },
             {
-              "name": "CREATED_TIME",
+              "name": "CREATE_DATE",
               "type": "DATETIME",
               "chnname": "创建时间",
               "remark": "",
               "pk": false,
-              "notNull": true,
+              "notNull": false,
               "autoIncrement": false,
               "defaultValue": ""
             },
             {
-              "name": "UPDATED_BY",
-              "type": "VARCHAR_32",
-              "chnname": "更新人",
+              "name": "UPDATER",
+              "type": "BIGINT_19",
+              "chnname": "更新者",
               "remark": "",
               "pk": false,
-              "notNull": true,
+              "notNull": false,
               "autoIncrement": false,
               "defaultValue": ""
             },
             {
-              "name": "UPDATED_TIME",
+              "name": "UPDATE_DATE",
               "type": "DATETIME",
               "chnname": "更新时间",
               "remark": "",
               "pk": false,
-              "notNull": true,
+              "notNull": false,
               "autoIncrement": false,
               "defaultValue": ""
             }
@@ -506,66 +204,6 @@
               "autoIncrement": false,
               "defaultValue": ""
             },
-            {
-              "name": "AREA",
-              "type": "VARCHAR_128",
-              "chnname": "区",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "AREA_ID",
-              "type": "BIGINT_19",
-              "chnname": "区ID",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "STREET",
-              "type": "VARCHAR_128",
-              "chnname": "街道",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "STREET_ID",
-              "type": "BIGINT_19",
-              "chnname": "街道ID",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "COMMUNITY",
-              "type": "VARCHAR_128",
-              "chnname": "社区",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "COMMUNITY_ID",
-              "type": "BIGINT_19",
-              "chnname": "社区ID",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
             {
               "name": "GRID",
               "type": "VARCHAR_128",
@@ -777,9 +415,29 @@
               "defaultValue": ""
             },
             {
-              "name": "TOPIC_ID",
-              "type": "VARCHAR_32",
-              "chnname": "话题ID",
+              "name": "TOPIC_ID",
+              "type": "VARCHAR_32",
+              "chnname": "话题ID",
+              "remark": "",
+              "pk": false,
+              "notNull": false,
+              "autoIncrement": false,
+              "defaultValue": ""
+            },
+            {
+              "name": "FRIENDLY_COMMUNITY_ID",
+              "type": "VARCHAR_32",
+              "chnname": "",
+              "remark": "",
+              "pk": false,
+              "notNull": false,
+              "autoIncrement": false,
+              "defaultValue": ""
+            },
+            {
+              "name": "PARENT_DEPT_IDS",
+              "type": "VARCHAR_1024",
+              "chnname": "父所有部门",
               "remark": "",
               "pk": false,
               "notNull": false,
@@ -787,9 +445,9 @@
               "defaultValue": ""
             },
             {
-              "name": "FRIENDLY_COMMUNITY_ID",
-              "type": "VARCHAR_32",
-              "chnname": "",
+              "name": "PARENT_DEPT_NAMES",
+              "type": "VARCHAR_1024",
+              "chnname": "父所有部门",
               "remark": "",
               "pk": false,
               "notNull": false,
@@ -1352,222 +1010,6 @@
             }
           ]
         },
-        {
-          "title": "EPDC_GRID_WORK_SCORE",
-          "chnname": "履行抓基层党建工作职责得分",
-          "fields": [
-            {
-              "name": "ID",
-              "type": "VARCHAR_32",
-              "chnname": "ID",
-              "remark": "",
-              "pk": true,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "USER_ID",
-              "type": "VARCHAR_32",
-              "chnname": "用户ID",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "NICK_NAME",
-              "type": "VARCHAR_128",
-              "chnname": "用户昵称",
-              "remark": "",
-              "pk": false,
-              "notNull": false,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "USER_FACE",
-              "type": "VARCHAR_128",
-              "chnname": "用户头像",
-              "remark": "",
-              "pk": false,
-              "notNull": false,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "IS_PARTY_MEMBER",
-              "type": "INT_10",
-              "chnname": "党员标识 0：否，1：是",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "DISTRICT",
-              "type": "VARCHAR_128",
-              "chnname": "区",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "DISTRICT_ID",
-              "type": "BIGINT_19",
-              "chnname": "区ID",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "STREET",
-              "type": "VARCHAR_128",
-              "chnname": "街道",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "STREET_ID",
-              "type": "BIGINT_19",
-              "chnname": "街道ID",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "COMMUNITY",
-              "type": "VARCHAR_128",
-              "chnname": "社区",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "COMMUNITY_ID",
-              "type": "BIGINT_19",
-              "chnname": "社区ID",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "GRID",
-              "type": "VARCHAR_128",
-              "chnname": "网格",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "GRID_ID",
-              "type": "BIGINT_19",
-              "chnname": "网格ID",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "SCORING_TIME",
-              "type": "DATETIME",
-              "chnname": "打分时间",
-              "remark": "",
-              "pk": false,
-              "notNull": false,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "SCORE",
-              "type": "INT_10",
-              "chnname": "分值",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "DEL_FLAG",
-              "type": "VARCHAR_32",
-              "chnname": "删除标识 0：未删除，1：已删除",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "REVISION",
-              "type": "INT_10",
-              "chnname": "乐观锁",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "CREATED_BY",
-              "type": "VARCHAR_32",
-              "chnname": "创建人",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "CREATED_TIME",
-              "type": "DATETIME",
-              "chnname": "创建时间",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "UPDATED_BY",
-              "type": "VARCHAR_32",
-              "chnname": "更新人",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "UPDATED_TIME",
-              "type": "DATETIME",
-              "chnname": "更新时间",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            }
-          ]
-        },
         {
           "title": "EPDC_IMG",
           "chnname": "党建系统图片表 党建系统图片表",
@@ -1897,67 +1339,7 @@
             {
               "name": "DISTRIBUTE_TIME",
               "type": "DATETIME",
-              "chnname": "发布时间",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "AREA",
-              "type": "VARCHAR_128",
-              "chnname": "区",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "AREA_ID",
-              "type": "BIGINT_19",
-              "chnname": "区ID",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "STREET",
-              "type": "VARCHAR_128",
-              "chnname": "街道",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "STREET_ID",
-              "type": "BIGINT_19",
-              "chnname": "街道ID",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "COMMUNITY",
-              "type": "VARCHAR_128",
-              "chnname": "社区",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "COMMUNITY_ID",
-              "type": "BIGINT_19",
-              "chnname": "社区ID",
+              "chnname": "发布时间",
               "remark": "",
               "pk": false,
               "notNull": true,
@@ -2143,6 +1525,26 @@
               "notNull": false,
               "autoIncrement": false,
               "defaultValue": ""
+            },
+            {
+              "name": "PARENT_DEPT_IDS",
+              "type": "VARCHAR_1024",
+              "chnname": "父所有部门",
+              "remark": "",
+              "pk": false,
+              "notNull": false,
+              "autoIncrement": false,
+              "defaultValue": ""
+            },
+            {
+              "name": "PARENT_DEPT_NAMES",
+              "type": "VARCHAR_1024",
+              "chnname": "父所有部门",
+              "remark": "",
+              "pk": false,
+              "notNull": false,
+              "autoIncrement": false,
+              "defaultValue": ""
             }
           ]
         },
@@ -2173,7 +1575,7 @@
             {
               "name": "STATE",
               "type": "INT_10",
-              "chnname": "状态 0-审核通过，1-反馈，2-关闭",
+              "chnname": "状态 0-审核通过，1-反馈，2-关闭, 3-话题转议题",
               "remark": "",
               "pk": true,
               "notNull": true,
@@ -2376,66 +1778,6 @@
               "autoIncrement": false,
               "defaultValue": ""
             },
-            {
-              "name": "AREA",
-              "type": "VARCHAR_128",
-              "chnname": "区",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "AREA_ID",
-              "type": "BIGINT_19",
-              "chnname": "区ID",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "STREET",
-              "type": "VARCHAR_128",
-              "chnname": "街道",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "STREET_ID",
-              "type": "BIGINT_19",
-              "chnname": "街道ID",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "COMMUNITY",
-              "type": "VARCHAR_128",
-              "chnname": "社区",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
-            {
-              "name": "COMMUNITY_ID",
-              "type": "BIGINT_19",
-              "chnname": "社区ID",
-              "remark": "",
-              "pk": false,
-              "notNull": true,
-              "autoIncrement": false,
-              "defaultValue": ""
-            },
             {
               "name": "GRID",
               "type": "VARCHAR_128",
@@ -2655,6 +1997,26 @@
               "notNull": false,
               "autoIncrement": false,
               "defaultValue": ""
+            },
+            {
+              "name": "PARENT_DEPT_IDS",
+              "type": "VARCHAR_1024",
+              "chnname": "父所有部门",
+              "remark": "",
+              "pk": false,
+              "notNull": false,
+              "autoIncrement": false,
+              "defaultValue": ""
+            },
+            {
+              "name": "PARENT_DEPT_NAMES",
+              "type": "VARCHAR_1024",
+              "chnname": "父所有部门",
+              "remark": "",
+              "pk": false,
+              "notNull": false,
+              "autoIncrement": false,
+              "defaultValue": ""
             }
           ]
         },
@@ -2831,7 +2193,7 @@
             {
               "name": "EVALUATION_LEVEL",
               "type": "INT_10",
-              "chnname": "评价满意度",
+              "chnname": "评价结果：0-不满意，1-基本满意，2-非常满意",
               "remark": "",
               "pk": false,
               "notNull": true,
@@ -3046,6 +2408,182 @@
             }
           ]
         },
+        {
+          "title": "EPDC_ITEM_INFORMATION",
+          "chnname": " ",
+          "fields": [
+            {
+              "name": "ID",
+              "type": "VARCHAR_32",
+              "chnname": "主键",
+              "remark": "",
+              "pk": true,
+              "notNull": true,
+              "autoIncrement": false,
+              "defaultValue": ""
+            },
+            {
+              "name": "DEPT_ID",
+              "type": "VARCHAR_32",
+              "chnname": "通知部门ID",
+              "remark": "",
+              "pk": false,
+              "notNull": true,
+              "autoIncrement": false,
+              "defaultValue": ""
+            },
+            {
+              "name": "TYPE",
+              "type": "INT_10",
+              "chnname": "消息类型 0-项目",
+              "remark": "",
+              "pk": false,
+              "notNull": true,
+              "autoIncrement": false,
+              "defaultValue": ""
+            },
+            {
+              "name": "BUSINESS_TYPE",
+              "type": "INT_10",
+              "chnname": "消息所属业务类型 0 -回应，1 -吹哨，5 -关闭，10- 结案",
+              "remark": "",
+              "pk": false,
+              "notNull": true,
+              "autoIncrement": false,
+              "defaultValue": ""
+            },
+            {
+              "name": "ASSOCIATED_BUSINESS_ID",
+              "type": "VARCHAR_32",
+              "chnname": "消息关联业务ID",
+              "remark": "",
+              "pk": false,
+              "notNull": true,
+              "autoIncrement": false,
+              "defaultValue": ""
+            },
+            {
+              "name": "ASSOCIATED_BUSINESS_CONTENT",
+              "type": "VARCHAR_2000",
+              "chnname": "消息关联业务内容",
+              "remark": "",
+              "pk": false,
+              "notNull": true,
+              "autoIncrement": false,
+              "defaultValue": ""
+            },
+            {
+              "name": "HANDLE_DEPT_ID",
+              "type": "BIGINT_19",
+              "chnname": "处理部门ID",
+              "remark": "",
+              "pk": false,
+              "notNull": true,
+              "autoIncrement": false,
+              "defaultValue": ""
+            },
+            {
+              "name": "HANDLE_DEPT",
+              "type": "VARCHAR_128",
+              "chnname": "处理部门",
+              "remark": "",
+              "pk": false,
+              "notNull": true,
+              "autoIncrement": false,
+              "defaultValue": ""
+            },
+            {
+              "name": "HANDLE_ADVICE",
+              "type": "VARCHAR_500",
+              "chnname": "处理意见",
+              "remark": "",
+              "pk": false,
+              "notNull": true,
+              "autoIncrement": false,
+              "defaultValue": ""
+            },
+            {
+              "name": "WHISTLE_DEPT",
+              "type": "VARCHAR_1024",
+              "chnname": "被吹哨部门（多个以逗号分隔）",
+              "remark": "",
+              "pk": false,
+              "notNull": false,
+              "autoIncrement": false,
+              "defaultValue": ""
+            },
+            {
+              "name": "READ_FLAG",
+              "type": "VARCHAR_1",
+              "chnname": "是否已读 0-否，1-是",
+              "remark": "",
+              "pk": false,
+              "notNull": true,
+              "autoIncrement": false,
+              "defaultValue": ""
+            },
+            {
+              "name": "REVISION",
+              "type": "INT_10",
+              "chnname": "乐观锁",
+              "remark": "",
+              "pk": false,
+              "notNull": false,
+              "autoIncrement": false,
+              "defaultValue": ""
+            },
+            {
+              "name": "CREATED_BY",
+              "type": "VARCHAR_32",
+              "chnname": "创建人",
+              "remark": "",
+              "pk": false,
+              "notNull": true,
+              "autoIncrement": false,
+              "defaultValue": ""
+            },
+            {
+              "name": "CREATED_TIME",
+              "type": "DATETIME",
+              "chnname": "创建时间",
+              "remark": "",
+              "pk": false,
+              "notNull": true,
+              "autoIncrement": false,
+              "defaultValue": ""
+            },
+            {
+              "name": "UPDATED_BY",
+              "type": "VARCHAR_32",
+              "chnname": "更新人",
+              "remark": "",
+              "pk": false,
+              "notNull": true,
+              "autoIncrement": false,
+              "defaultValue": ""
+            },
+            {
+              "name": "UPDATED_TIME",
+              "type": "DATETIME",
+              "chnname": "更新时间",
+              "remark": "",
+              "pk": false,
+              "notNull": true,
+              "autoIncrement": false,
+              "defaultValue": ""
+            },
+            {
+              "name": "DEL_FLAG",
+              "type": "VARCHAR_1",
+              "chnname": "删除标记 0-否，1-是",
+              "remark": "",
+              "pk": false,
+              "notNull": true,
+              "autoIncrement": false,
+              "defaultValue": ""
+            }
+          ]
+        },
         {
           "title": "UNDO_LOG",
           "chnname": "",
@@ -3734,6 +3272,33 @@
             "type": "VARCHAR(64)"
           }
         }
+      },
+      {
+        "name": "INT UNSIGNED_10",
+        "code": "INT UNSIGNED_10",
+        "apply": {
+          "MYSQL": {
+            "type": "INT UNSIGNED(10)"
+          }
+        }
+      },
+      {
+        "name": "TINYINT UNSIGNED_3",
+        "code": "TINYINT UNSIGNED_3",
+        "apply": {
+          "MYSQL": {
+            "type": "TINYINT UNSIGNED(3)"
+          }
+        }
+      },
+      {
+        "name": "VARCHAR_50",
+        "code": "VARCHAR_50",
+        "apply": {
+          "MYSQL": {
+            "type": "VARCHAR(50)"
+          }
+        }
       }
     ],
     "database": [
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsDetailDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsDetailDTO.java
index 5c87441d8..ee80242e1 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsDetailDTO.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsDetailDTO.java
@@ -73,5 +73,10 @@ public class EpdcEventsDetailDTO implements Serializable {
     /**
      * 所属网格详细信息
      */
-    private String ownGrid;
+    private String allDeptNames;
+
+    /**
+     * 友邻社群
+     */
+    private String groupName;
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcRejectEventDetailDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcRejectEventDetailDTO.java
index edc82e604..202d25705 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcRejectEventDetailDTO.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcRejectEventDetailDTO.java
@@ -62,5 +62,10 @@ public class EpdcRejectEventDetailDTO implements Serializable {
     /**
      * 所属网格详细信息
      */
-    private String ownGrid;
+    private String allDeptNames;
+
+    /**
+     * 友邻社群
+     */
+    private String groupName;
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventSubmitFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventSubmitFormDTO.java
index 05585d995..ceaa3581a 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventSubmitFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventSubmitFormDTO.java
@@ -110,4 +110,29 @@ public class EpdcEventSubmitFormDTO implements Serializable {
      * 社群名称
      */
     private String groupName;
+
+    /**
+     * 状态
+     */
+    private Integer eventState;
+
+    /**
+     * 分类编码
+     */
+    private String categoryCode;
+
+    /**
+     * 一级分类编码
+     */
+    private String firstCategoryCode;
+
+    /**
+     * 分类全称
+     */
+    private String categoryFullName;
+
+    /**
+     * 处理意见
+     */
+    private String advice;
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueContentDetailDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueContentDetailDTO.java
index 719515a6c..fc5a1a2cf 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueContentDetailDTO.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueContentDetailDTO.java
@@ -63,7 +63,7 @@ public class IssueContentDetailDTO implements Serializable {
     /**
      * 所属网格详细信息
      */
-    private String ownGrid;
+    private String allDeptNames;
     /**
      * 所属类别
      */
@@ -78,4 +78,9 @@ public class IssueContentDetailDTO implements Serializable {
      * 项目处理进度
      */
     List<ItemHandleProgressResultDTO> handleProgressResultDTOS;
+
+    /**
+     * 友邻社群
+     */
+    private String groupName;
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueWaitHandleDetailDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueWaitHandleDetailDTO.java
index 859c2b4b9..e9c04bff3 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueWaitHandleDetailDTO.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueWaitHandleDetailDTO.java
@@ -55,7 +55,7 @@ public class IssueWaitHandleDetailDTO implements Serializable {
     /**
      * 所属网格详细信息
      */
-    private String ownGrid;
+    private String allDeptNames;
     /**
      * 类别
      */
@@ -64,4 +64,9 @@ public class IssueWaitHandleDetailDTO implements Serializable {
      * 议题处理进度
      */
     List<IssueProgressResultDTO> issueProgressResultDTOS;
+
+    /**
+     * 友邻社群
+     */
+    private String groupName;
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueProgressResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueProgressResultDTO.java
index f57a6c1dd..722ba728e 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueProgressResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueProgressResultDTO.java
@@ -42,4 +42,14 @@ public class IssueProgressResultDTO implements Serializable {
      * 处理图片
      */
     private List<String> images;
+
+    /**
+     * 操作人电话
+     */
+    private String mobile;
+
+    /**
+     * 来源社群
+     */
+    private String groupName;
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/WorkIssueDetailResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/WorkIssueDetailResultDTO.java
index 28138dea3..3031a47eb 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/WorkIssueDetailResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/WorkIssueDetailResultDTO.java
@@ -26,7 +26,7 @@ public class WorkIssueDetailResultDTO implements Serializable {
     /**
      * 议题内容
      */
-    private String issueContent;
+    private String content;
     /**
      * 手机号
      */
@@ -50,7 +50,7 @@ public class WorkIssueDetailResultDTO implements Serializable {
     /**
      * 议题地址
      */
-    private String issueAddress;
+    private String address;
     /**
      * 浏览量
      */
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemContentForPCEndResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemContentForPCEndResultDTO.java
index f57147327..c5bdc31f4 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemContentForPCEndResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemContentForPCEndResultDTO.java
@@ -93,4 +93,9 @@ public class ItemContentForPCEndResultDTO implements Serializable {
      * 所属类别
      */
     private String categoryName;
+
+    /**
+     * 友邻社群
+     */
+    private String groupName;
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailForPCEndResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailForPCEndResultDTO.java
index 6c191096c..a228b389c 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailForPCEndResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailForPCEndResultDTO.java
@@ -93,4 +93,9 @@ public class ItemDetailForPCEndResultDTO implements Serializable {
      * 评论数
      */
     private Integer commentNum;
+
+    /**
+     * 友邻社群
+     */
+    private String groupName;
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcAppEventsController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcAppEventsController.java
index 9f5287bc6..a66b1d386 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcAppEventsController.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcAppEventsController.java
@@ -6,6 +6,7 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.dto.events.form.EpdcEventSubmitFormDTO;
+import com.elink.esua.epdc.dto.issue.IssueDTO;
 import com.elink.esua.epdc.modules.events.service.EpdcEventsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -36,4 +37,20 @@ public class EpdcAppEventsController {
         return new Result();
     }
 
+    /**
+     *
+     * 话题转议题
+     *
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author liuchuang
+     * @since 2019/11/25 19:22
+     */
+    @PostMapping("toIssue")
+    public Result<IssueDTO> topicToIssue(@RequestBody EpdcEventSubmitFormDTO formDto) {
+        //效验数据
+        ValidatorUtils.validateEntity(formDto, AddGroup.class, DefaultGroup.class);
+        return epdcEventsService.topicToIssue(formDto);
+    }
+
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java
index ae2208a88..ec161bc53 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java
@@ -24,10 +24,10 @@ import com.elink.esua.epdc.dto.events.*;
 import com.elink.esua.epdc.dto.events.form.EpdcEventSubmitFormDTO;
 import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO;
 import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO;
+import com.elink.esua.epdc.dto.issue.IssueDTO;
 import com.elink.esua.epdc.dto.issue.form.IssuePendingResponseFormDTO;
 import com.elink.esua.epdc.dto.issue.result.IssuePendingResponseResultDTO;
 import com.elink.esua.epdc.modules.events.entity.EpdcEventsEntity;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 import java.util.Map;
@@ -69,7 +69,7 @@ public interface EpdcEventsService extends BaseService<EpdcEventsEntity> {
      * @Author: liuchuang
      * @Date: 2019/9/8 16:52
      */
-    void saveEvent(EpdcEventSubmitFormDTO dto);
+    EpdcEventsEntity saveEvent(EpdcEventSubmitFormDTO dto);
 
     void update(EpdcEventsDTO dto);
 
@@ -197,4 +197,15 @@ public interface EpdcEventsService extends BaseService<EpdcEventsEntity> {
      */
     Result<List<IssuePendingResponseResultDTO>> listIssuePendingResponse(IssuePendingResponseFormDTO formDto);
 
+    /**
+     *
+     * 话题转议题
+     *
+     * @params [dto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author liuchuang
+     * @since 2019/11/25 19:23
+     */
+    Result<IssueDTO> topicToIssue(EpdcEventSubmitFormDTO dto);
+
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java
index 137a30eb1..6d256aa46 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java
@@ -39,6 +39,7 @@ import com.elink.esua.epdc.dto.events.*;
 import com.elink.esua.epdc.dto.events.form.EpdcEventSubmitFormDTO;
 import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO;
 import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO;
+import com.elink.esua.epdc.dto.issue.IssueDTO;
 import com.elink.esua.epdc.dto.issue.form.IssuePendingResponseFormDTO;
 import com.elink.esua.epdc.dto.issue.result.IssuePendingResponseResultDTO;
 import com.elink.esua.epdc.modules.async.DeptRespondTask;
@@ -136,7 +137,7 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void saveEvent(EpdcEventSubmitFormDTO dto) {
+    public EpdcEventsEntity saveEvent(EpdcEventSubmitFormDTO dto) {
         EpdcEventsEntity entity = ConvertUtils.sourceToTarget(dto, EpdcEventsEntity.class);
         insert(entity);
 
@@ -145,6 +146,8 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
 
         // 发送菜单消息-议题待回应
         this.sendMenuNoticeOfEventRespond(entity.getGridId(), null);
+
+        return entity;
     }
 
     @Override
@@ -219,14 +222,9 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
         imgService.saveImages(dto.getImages(),referenceId,imageType);
 
         // 插入部门响应记录
-        deptRespondTask.saveEventDeptRespond(dto);
-        // 事件来源-友邻社群-话题转议题
-        if (StringUtils.isNotEmpty(eventsEntity.getGroupId())) {
-            this.reviewCallback(eventsEntity.getTopicId(), dto);
-        } else {
-            // 发送消息
-            newsTask.insertUserInformation(informationFormDTO);
-        }
+        // deptRespondTask.saveEventDeptRespond(dto);
+        // 发送消息
+        newsTask.insertUserInformation(informationFormDTO);
         // 发送菜单消息-议题待回应
         this.sendMenuNoticeOfEventRespond(eventsEntity.getGridId(), null);
         return new Result();
@@ -419,4 +417,33 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
         formDto.setDeptIdList(list);
         return baseDao.listIssuePendingResponse(formDto);
     }
+
+    @Override
+    public Result<IssueDTO> topicToIssue(EpdcEventSubmitFormDTO dto) {
+        dto.setEventState(EventIssueItemState.EVENT_REVIEW_PASS);
+        // 保存事件
+        EpdcEventsEntity eventsEntity = this.saveEvent(dto);
+        // 保存议题
+        IssueEntity issueEntity = this.initIssueEntity(eventsEntity);
+        issueService.insert(issueEntity);
+        // 插入议题处理表一条审核通过记录
+        IssueHandleEntity issueHandleEntity = new IssueHandleEntity();
+        issueHandleEntity.setIssueId(issueEntity.getId());
+        issueHandleEntity.setState(NumConstant.THREE);
+        issueHandleEntity.setAdvice(dto.getAdvice());
+        issueHandleEntity.setGroupName(dto.getGroupName());
+        UserDetail user = SecurityUser.getUser();
+        issueHandleEntity.setHandlerDeptId(user.getId());
+        issueHandleEntity.setHandlerDept(user.getRealName());
+        issueHandleEntity.setMobile(user.getMobile());
+        issueHandleService.insert(issueHandleEntity);
+
+        // 发送菜单消息-议题待处理
+        issueService.sendIssueHandleMenuNotice(issueEntity.getGridId(), null);
+
+        IssueDTO issueDTO = new IssueDTO();
+        issueDTO.setId(issueEntity.getId());
+        issueDTO.setEventId(issueEntity.getEventId());
+        return new Result<IssueDTO>().ok(issueDTO);
+    }
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/entity/IssueHandleEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/entity/IssueHandleEntity.java
index c5488cd6c..f107284a0 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/entity/IssueHandleEntity.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/entity/IssueHandleEntity.java
@@ -62,4 +62,14 @@ public class IssueHandleEntity extends BaseEpdcEntity {
 	 */
 	private String handlerDept;
 
+	/**
+	 * 操作人联系方式
+	 */
+	private String mobile;
+
+	/**
+	 * 来源社群
+	 */
+	private String groupName;
+
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml
index 7926cb7e7..4c64cdc66 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml
@@ -14,7 +14,8 @@
         <result property="issueLongitude" column="ISSUE_LONGITUDE"/>
         <result property="userFace" column="USER_FACE"/>
         <result property="partyFlag" column="IS_PARTY_MEMBER"/>
-        <result property="ownGrid" column="ownGrid"/>
+        <result property="allDeptNames" column="ALL_DEPT_NAMES"/>
+        <result property="groupName" column="GROUP_NAME"/>
         <collection property="imageArray" ofType="java.lang.String">
             <result property="image" column="IMG_URL"/>
         </collection>
@@ -37,7 +38,8 @@
             e.ISSUE_LATITUDE,
             e.ISSUE_LONGITUDE,
             e.ADVICE,
-            CONCAT(e.AREA,e.STREET,e.COMMUNITY,e.GRID) AS ownGrid
+            e.GROUP_NAME,
+            e.ALL_DEPT_NAMES
         FROM
             epdc_events e
             LEFT JOIN epdc_img i ON e.ID = i.REFERENCE_ID
@@ -69,10 +71,10 @@
                 AND temp.grid_id = #{gridId}
             </if>
             <if test="streetId != null and streetId != ''">
-                AND temp.STREET_ID = #{streetId}
+                AND find_in_set(#{streetId},temp.PARENT_DEPT_IDS)
             </if>
             <if test="communityId != null and communityId != ''">
-                AND temp.COMMUNITY_ID = #{communityId}
+                AND find_in_set(#{communityId},temp.PARENT_DEPT_IDS)
             </if>
             AND temp.EVENT_STATE = 0
         ORDER BY temp.CREATED_TIME DESC
@@ -95,10 +97,10 @@
                 AND temp.grid_id = #{gridId}
             </if>
             <if test="streetId != null and streetId != ''">
-                AND temp.STREET_ID = #{streetId}
+                AND find_in_set(#{streetId},temp.PARENT_DEPT_IDS)
             </if>
             <if test="communityId != null and communityId != ''">
-                AND temp.COMMUNITY_ID = #{communityId}
+                AND find_in_set(#{communityId},temp.PARENT_DEPT_IDS)
             </if>
             AND temp.EVENT_STATE = 2
         ORDER BY
@@ -116,7 +118,8 @@
         <result property="advice" column="ADVICE"/>
         <result property="issueLatitude" column="ISSUE_LATITUDE"/>
         <result property="issueLongitude" column="ISSUE_LONGITUDE"/>
-        <result property="ownGrid" column="ownGrid"/>
+        <result property="allDeptNames" column="ALL_DEPT_NAMES"/>
+        <result property="groupName" column="GROUP_NAME"/>
         <collection property="images" ofType="java.lang.String">
             <result property="image" column="IMG_URL"/>
         </collection>
@@ -134,7 +137,8 @@
             img.IMG_URL,
             temp.ISSUE_LATITUDE,
             temp.ISSUE_LONGITUDE,
-            CONCAT(temp.AREA,temp.STREET,temp.COMMUNITY,temp.GRID) AS ownGrid
+            temp.ALL_DEPT_NAMES,
+            temp.GROUP_NAME
         FROM
             epdc_events temp
             LEFT JOIN epdc_img img ON temp.ID = img.REFERENCE_ID
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml
index fc0fcd5a7..af567a471 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml
@@ -26,12 +26,12 @@
             <if test="gridId != null and gridId != ''">
                 AND issue.GRID_ID = #{gridId}
             </if>
-            <if test="streetId != null and streetId != ''">
-                AND issue.STREET_ID = #{streetId}
-            </if>
-            <if test="communityId != null and communityId != ''">
-                AND issue.COMMUNITY_ID = #{communityId}
-            </if>
+        <if test="streetId != null and streetId != ''">
+            AND find_in_set(#{streetId},issue.PARENT_DEPT_IDS)
+        </if>
+        <if test="communityId != null and communityId != ''">
+            AND find_in_set(#{communityId},issue.PARENT_DEPT_IDS)
+        </if>
         ORDER BY
             issue.CREATED_TIME DESC
     </select>
@@ -45,7 +45,8 @@
         <result property="address" column="ISSUE_ADDRESS"/>
         <result property="issueLatitude" column="ISSUE_LATITUDE"/>
         <result property="issueLongitude" column="ISSUE_LONGITUDE"/>
-        <result property="ownGrid" column="ownGrid"/>
+        <result property="allDeptNames" column="ALL_DEPT_NAMES"/>
+        <result property="groupName" column="GROUP_NAME"/>
         <result property="categoryName" column="CATEGORY_NAME"/>
         <collection property="images" ofType="java.lang.String">
             <result property="image" column="IMG_URL"/>
@@ -63,7 +64,8 @@
                 i.ISSUE_LATITUDE,
                 i.ISSUE_LONGITUDE,
                 cate.CATEGORY_NAME,
-                CONCAT(i.AREA,i.STREET,i.COMMUNITY,i.GRID) AS ownGrid,
+                i.ALL_DEPT_NAMES,
+                i.GROUP_NAME,
                 img.IMG_URL
             FROM
                 epdc_issue i
@@ -86,7 +88,8 @@
         <result property="issueLatitude" column="ISSUE_LATITUDE"/>
         <result property="issueLongitude" column="ISSUE_LONGITUDE"/>
         <result property="categoryName" column="CATEGORY_NAME"/>
-        <result property="ownGrid" column="ownGrid"/>
+        <result property="allDeptNames" column="ALL_DEPT_NAMES"/>
+        <result property="groupName" column="GROUP_NAME"/>
         <result property="approveNum" column="APPROVE_NUM"/>
         <result property="opposeNum" column="OPPOSE_NUM"/>
         <result property="commentNum" column="COMMENT_NUM"/>
@@ -108,7 +111,8 @@
             i.ISSUE_LATITUDE,
             i.ISSUE_LONGITUDE,
             cate.CATEGORY_NAME,
-            CONCAT(i.AREA,i.STREET,i.COMMUNITY,i.GRID) AS ownGrid
+            i.ALL_DEPT_NAMES,
+            i.GROUP_NAME
         FROM
             epdc_issue i
             LEFT JOIN epdc_events e ON i.EVENT_ID = e.ID
@@ -305,6 +309,8 @@
         <result property="createdTime" column="CREATED_TIME"/>
         <result property="advice" column="ADVICE"/>
         <result property="handlerDept" column="HANDLER_DEPT"/>
+        <result property="mobile" column="MOBILE"/>
+        <result property="groupName" column="GROUP_NAME"/>
         <collection property="images" ofType="java.lang.String">
             <result property="image" column="IMG_URL"/>
         </collection>
@@ -316,6 +322,8 @@
             hd.CREATED_TIME,
             hd.ADVICE,
             hd.HANDLER_DEPT,
+            hd.MOBILE,
+            hd.GROUP_NAME,
             img.IMG_URL
         FROM
             epdc_issue_handle hd
@@ -500,13 +508,13 @@
     <resultMap id="workIssueDetailMap" type="com.elink.esua.epdc.dto.issue.result.WorkIssueDetailResultDTO">
         <result property="id" column="ID"/>
         <result property="eventId" column="EVENT_ID"/>
-        <result property="issueContent" column="ISSUE_CONTENT"/>
+        <result property="content" column="ISSUE_CONTENT"/>
         <result property="mobile" column="MOBILE"/>
         <result property="distributeTime" column="DISTRIBUTE_TIME"/>
         <result property="categoryName" column="DISTRIBUTE_TIME"/>
         <result property="nickname" column="NICK_NAME"/>
         <result property="avatar" column="USER_FACE"/>
-        <result property="issueAddress" column="ISSUE_ADDRESS"/>
+        <result property="address" column="ISSUE_ADDRESS"/>
         <result property="browseNum" column="BROWSE_NUM"/>
         <result property="approveNum" column="APPROVE_NUM"/>
         <result property="opposeNum" column="OPPOSE_NUM"/>
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
index 84af8da1c..cd23d1337 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
@@ -407,10 +407,10 @@
                 AND item.GRID_ID = #{gridId}
             </if>
             <if test="streetId != null and streetId != ''">
-                AND item.STREET_ID = #{streetId}
+                AND find_in_set(#{streetId},item.PARENT_DEPT_IDS)
             </if>
             <if test="communityId != null and communityId != ''">
-                AND item.COMMUNITY_ID = #{communityId}
+                AND find_in_set(#{communityId},item.PARENT_DEPT_IDS)
             </if>
         ORDER BY
             item.CREATED_TIME DESC
@@ -429,6 +429,7 @@
         <result property="approveNum" column="APPROVE_NUM"/>
         <result property="opposeNum" column="OPPOSE_NUM"/>
         <result property="commentNum" column="COMMENT_NUM"/>
+        <result property="groupName" column="GROUP_NAME"/>
         <collection property="images" ofType="java.lang.String">
             <result property="image" column="IMG_URL"/>
         </collection>
@@ -447,7 +448,8 @@
             eve.OPPOSE_NUM,
             eve.COMMENT_NUM,
             cate.CATEGORY_NAME,
-            img.IMG_URL
+            img.IMG_URL,
+            item.GROUP_NAME
         FROM
             epdc_item item
             LEFT JOIN epdc_img img ON item.EVENT_ID = img.REFERENCE_ID
@@ -595,6 +597,7 @@
         <result property="issueAddress" column="ISSUE_ADDRESS"/>
         <result property="issueLatitude" column="ISSUE_LATITUDE"/>
         <result property="issueLongitude" column="ISSUE_LONGITUDE"/>
+        <result property="groupName" column="GROUP_NAME"/>
         <result property="categoryName" column="CATEGORY_NAME"/>
         <result property="approveNum" column="APPROVE_NUM"/>
         <result property="opposeNum" column="OPPOSE_NUM"/>
@@ -616,6 +619,7 @@
             item.ISSUE_ADDRESS,
             item.ISSUE_LATITUDE,
             item.ISSUE_LONGITUDE,
+            item.GROUP_NAME,
             cate.CATEGORY_NAME,
             eve.APPROVE_NUM,
             eve.OPPOSE_NUM,
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/constant/GroupNoticeConstant.java b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/constant/GroupNoticeConstant.java
index 049fec953..d229b159b 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/constant/GroupNoticeConstant.java
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/constant/GroupNoticeConstant.java
@@ -77,7 +77,7 @@ public interface GroupNoticeConstant {
     /**
      * 转议题-通过
      */
-    String NOTICE_TOPIC_TO_ISSUE_PASS = "转议题【审核通过】";
+    String NOTICE_TOPIC_TO_ISSUE_PASS = "转议题";
 
     /**
      * 转议题-通过-内容-群主
@@ -87,7 +87,7 @@ public interface GroupNoticeConstant {
     /**
      * 转议题-通过-内容-发布话题用户
      */
-    String NOTICE_TOPIC_TO_ISSUE_PASS_TOPIC_USER_CONTENT = "您的话题已经审核通过并成为议题，可在 党群议事查看。";
+    String NOTICE_TOPIC_TO_ISSUE_PASS_TOPIC_USER_CONTENT = "您的话题已经被群主转成议题，可在 党群议事查看。";
 
     /**
      * 我的消息类型：0审核通知
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/form/TopicChangeToIssueFormDTO.java b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/form/TopicChangeToIssueFormDTO.java
index 73458e48a..9d51d7122 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/form/TopicChangeToIssueFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/form/TopicChangeToIssueFormDTO.java
@@ -22,6 +22,17 @@ public class TopicChangeToIssueFormDTO implements Serializable {
     @NotBlank(message = "话题ID不能为空")
     private String id;
 
+    /**
+     * 分类ID
+     */
+    @NotBlank(message = "话题分类不能为空")
+    private String categoryId;
+
+    /**
+     * 处理意见
+     */
+    private String advice;
+
     /**
      * 操作人ID
      */
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/result/TopicListResultDTO.java b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/result/TopicListResultDTO.java
index c6157522c..ee00ca61f 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/result/TopicListResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/result/TopicListResultDTO.java
@@ -21,6 +21,11 @@ public class TopicListResultDTO implements Serializable {
      */
     private String topicContent;
 
+    /**
+     * 用户ID
+     */
+    private String userId;
+
     /**
      * 发布人
      */
@@ -61,6 +66,9 @@ public class TopicListResultDTO implements Serializable {
      */
     private List<String> images;
 
-
+    /**
+     * 关注度
+     */
+    private Integer attentionNum;
 
 }
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentServiceImpl.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentServiceImpl.java
index ad8b332d7..8aae141f2 100755
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentServiceImpl.java
@@ -121,6 +121,7 @@ public class TopicCommentServiceImpl extends BaseServiceImpl<TopicCommentDao, To
         commentEntity.setUserId(commentFormDTO.getUserId());
         commentEntity.setUsername(commentFormDTO.getUserName());
         commentEntity.setUserFace(commentFormDTO.getUserFace());
+        commentEntity.setTopicId(commentFormDTO.getTopicId());
 
         boolean isComment = true;
 
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/feign/EventFeignClient.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/feign/EventFeignClient.java
index d6e88e2e1..776c640c4 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/feign/EventFeignClient.java
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/feign/EventFeignClient.java
@@ -4,6 +4,7 @@ import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.comment.EpdcCommentsAndAttitudeFromTopicFormDTO;
 import com.elink.esua.epdc.dto.events.form.EpdcEventSubmitFormDTO;
+import com.elink.esua.epdc.dto.issue.IssueDTO;
 import com.elink.esua.epdc.modules.feign.fallback.EventFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
@@ -28,8 +29,8 @@ public interface EventFeignClient {
      * @author liuchuang
      * @since 2019/11/8 14:42
      */
-    @PostMapping(value = "events/epdc-app/event/submit", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result submitEvent(EpdcEventSubmitFormDTO formDto);
+    @PostMapping(value = "events/epdc-app/event/toIssue", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<IssueDTO> submitEvent(EpdcEventSubmitFormDTO formDto);
 
     /**
      *
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/feign/fallback/EventFeignClientFallback.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/feign/fallback/EventFeignClientFallback.java
index 7b1a14a38..470b023f3 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/feign/fallback/EventFeignClientFallback.java
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/feign/fallback/EventFeignClientFallback.java
@@ -5,6 +5,7 @@ import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.comment.EpdcCommentsAndAttitudeFromTopicFormDTO;
 import com.elink.esua.epdc.dto.events.form.EpdcEventSubmitFormDTO;
+import com.elink.esua.epdc.dto.issue.IssueDTO;
 import com.elink.esua.epdc.modules.feign.EventFeignClient;
 import org.springframework.stereotype.Component;
 
@@ -16,7 +17,7 @@ import org.springframework.stereotype.Component;
 public class EventFeignClientFallback implements EventFeignClient {
 
     @Override
-    public Result submitEvent(EpdcEventSubmitFormDTO formDto) {
+    public Result<IssueDTO> submitEvent(EpdcEventSubmitFormDTO formDto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "submitEvent", formDto);
     }
 
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/entity/TopicEntity.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/entity/TopicEntity.java
index 5de270f3c..960a55dd9 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/entity/TopicEntity.java
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/entity/TopicEntity.java
@@ -127,12 +127,12 @@ public class TopicEntity extends BaseEpdcEntity {
     /**
      * 话题位置纬度
      */
-	private BigDecimal topicLatitude;
+	private Double topicLatitude;
 
     /**
      * 话题位置经度
      */
-	private BigDecimal topicLongitude;
+	private Double topicLongitude;
 
     /**
      * 友邻社群
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicServiceImpl.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicServiceImpl.java
index d5f62beb4..6a47e3c4d 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicServiceImpl.java
@@ -39,6 +39,7 @@ import com.elink.esua.epdc.dto.events.form.EpdcEventSubmitFormDTO;
 import com.elink.esua.epdc.dto.group.GroupDTO;
 import com.elink.esua.epdc.dto.group.UserGroupDTO;
 import com.elink.esua.epdc.dto.group.result.TopicAuditRecordResultDTO;
+import com.elink.esua.epdc.dto.issue.IssueDTO;
 import com.elink.esua.epdc.dto.topic.TopicDTO;
 import com.elink.esua.epdc.dto.topic.TopicDetailDTO;
 import com.elink.esua.epdc.dto.topic.form.TopicListFormDTO;
@@ -259,17 +260,30 @@ public class TopicServiceImpl extends BaseServiceImpl<TopicDao, TopicEntity> imp
         if (!checkResult.success()) {
             return checkResult;
         }
-        // 插入事件表
+
+        // 插入事件表、议题表
         EpdcEventSubmitFormDTO eventSubmitFormDto = baseDao.selectOneOfTopicForChangeToIssue(formDto.getId());
-        Result eventResult = eventFeignClient.submitEvent(eventSubmitFormDto);
+        eventSubmitFormDto.setAdvice(formDto.getAdvice());
+        Result<IssueDTO> eventResult = eventFeignClient.submitEvent(eventSubmitFormDto);
         if (!eventResult.success()) {
             return eventResult;
         }
 
+        IssueDTO issueDTO = eventResult.getData();
+
+        // 拷贝评论、评论的支持反对到事件
+        TopicReviewFormDTO reviewFormDto = new TopicReviewFormDTO();
+        reviewFormDto.setTopicId(topicDto.getId());
+        reviewFormDto.setEventId(issueDTO.getEventId());
+        this.copyCommentsAndAttitudeToEvents(reviewFormDto);
+
+        // 发送消息
+        this.sendNews(issueDTO.getId(), topicDto.getUserId());
+
         // 更新话题状态
         TopicEntity entity = new TopicEntity();
         entity.setId(formDto.getId());
-        entity.setState(TopicStateEnum.TOPIC_STATE_CHANGE_TO_ISSUE_PENDING_REVIEW.getValue());
+        entity.setState(TopicStateEnum.TOPIC_STATE_CHANGED_ISSUE.getValue());
         if (updateById(entity)) {
             return new Result();
         }
@@ -393,4 +407,26 @@ public class TopicServiceImpl extends BaseServiceImpl<TopicDao, TopicEntity> imp
         topicChangeToIssueTask.copyCommentsAndAttitudeToEvents(eventFormDto);
     }
 
+    /**
+     *
+     * 发送消息
+     *
+     * @params [issueId, userId]
+     * @return void
+     * @author liuchuang
+     * @since 2019/11/26 15:04
+     */
+    private void sendNews(String issueId, String userId) {
+        // 组装发送消息内容-发布话题用户
+        EpdcInformationFormDTO topicUserNotice = new EpdcInformationFormDTO();
+        topicUserNotice.setType(GroupNoticeConstant.NOTICE_TYPE_PROGRESS_NOTICE);
+        topicUserNotice.setTitle(GroupNoticeConstant.NOTICE_TOPIC_TO_ISSUE_PASS);
+        topicUserNotice.setContent(GroupNoticeConstant.NOTICE_TOPIC_TO_ISSUE_PASS_TOPIC_USER_CONTENT);
+        topicUserNotice.setBusinessType(GroupNoticeConstant.NOTICE_BUSINESS_TYPE_TOPIC_TO_ISSUE_PASSED);
+        topicUserNotice.setBusinessId(issueId);
+        topicUserNotice.setUserId(userId);
+
+        newsTask.insertUserInformation(topicUserNotice);
+    }
+
 }
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/comment/TopicCommentDao.xml b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/comment/TopicCommentDao.xml
index 136b2a2a0..68a9ee3ad 100755
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/comment/TopicCommentDao.xml
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/comment/TopicCommentDao.xml
@@ -80,7 +80,7 @@
         <result property="content" column="CONTENT"/>
         <result property="commentTime" column="CREATED_TIME"/>
         <result property="user.userId" column="USER_ID"/>
-        <result property="user.userName" column="USER_NAME"/>
+        <result property="user.userName" column="USERNAME"/>
         <result property="user.userFace" column="USER_FACE"/>
         <result property="approveNum" column="LIKE_COUNT"/>
         <result property="opposeNum" column="UN_LIKE_COUNT"/>
@@ -99,13 +99,13 @@
         t2.CREATED_TIME,
         t2.USER_ID,
         t2.USER_FACE,
-        t2.USER_NAME,
+        t2.USERNAME,
         t2.LIKE_COUNT,
         t2.UN_LIKE_COUNT,
         t2.userLike,
         t2.userDislike,
         t3.ID AS replyId,
-        t3.USER_NAME AS replyUserName,
+        t3.USERNAME AS replyUserName,
         t3.CONTENT AS replyContent,
         t2.attitudeNum
         FROM
@@ -121,7 +121,7 @@
         t1.CREATED_TIME,
         t1.USER_ID,
         t1.USER_FACE,
-        t1.USER_NAME,
+        t1.USERNAME,
         t1.LIKE_COUNT,
         t1.UN_LIKE_COUNT,
         (t1.REPLY_COUNT + t1.LIKE_COUNT + t1.UN_LIKE_COUNT) AS attitudeNum
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/topic/TopicDao.xml b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/topic/TopicDao.xml
index b401f16ac..84fb0cf11 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/topic/TopicDao.xml
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/topic/TopicDao.xml
@@ -126,10 +126,12 @@
         <result property="createdTime" column="CREATED_TIME"/>
         <result property="nickname" column="NICKNAME"/>
         <result property="userAvatar" column="USER_FACE"/>
+        <result property="userId" column="USER_ID"/>
         <result property="partyMember" column="PARTY_MEMBER"/>
         <result property="state" column="STATE"/>
         <result property="issueId" column="ISSUE_ID"/>
         <result property="itemId" column="ITEM_ID"/>
+        <result property="attentionNum" column="attentionNum"/>
         <collection property="images" ofType="java.lang.String">
             <result property="image" column="IMG_URL"/>
         </collection>
@@ -141,10 +143,12 @@
         topic.CREATED_TIME,
         topic.NICKNAME,
         topic.USER_FACE,
+        topic.USER_ID,
         topic.PARTY_MEMBER,
         topic.STATE,
         topic.ISSUE_ID,
         topic.ITEM_ID,
+        (topic.COMMENT_NUM + topic.BROWSE_NUM) AS attentionNum,
         img.IMG_URL
         FROM
         epdc_topic topic
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/pom.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/pom.xml
index 0e6be7261..8663d5d04 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/pom.xml
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/pom.xml
@@ -10,6 +10,17 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>epdc-kpi-client</artifactId>
+    <packaging>jar</packaging>
 
+    <dependencies>
+        <dependency>
+            <groupId>com.esua.epdc</groupId>
+            <artifactId>epdc-commons-tools</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+    </dependencies>
 
+    <build>
+        <finalName>${project.artifactId}</finalName>
+    </build>
 </project>
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/epdc/esua/epdc.gitkeep b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/epdc/esua/epdc.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiFormulaDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiFormulaDTO.java
new file mode 100644
index 000000000..cc7252a4a
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiFormulaDTO.java
@@ -0,0 +1,107 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.dto;
+
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 绩效考核公式
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2019-11-26
+ */
+@Data
+public class KpiFormulaDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 公式编码
+     */
+	private String code;
+
+    /**
+     * 公式名称
+     */
+	private String name;
+
+	/**
+	 * 方法名
+	 */
+	private String functionName;
+
+    /**
+     * 公式运行方法（Javascript）
+     */
+	private String formula;
+
+    /**
+     * 公式参数数量
+     */
+	private Integer paramAmount;
+
+    /**
+     * 公式描述
+     */
+	private String description;
+
+    /**
+     * 备注
+     */
+	private String remark;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+    /**
+     * 删除标记
+     */
+	private String delFlag;
+
+}
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml
index 696114d91..0071e0dd0 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml
@@ -10,6 +10,8 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>epdc-kpi-server</artifactId>
+    <packaging>jar</packaging>
+
     <dependencies>
         <dependency>
             <groupId>com.esua.epdc</groupId>
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/epdc/esua/KpiApplication.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/KpiApplication.java
similarity index 95%
rename from esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/epdc/esua/KpiApplication.java
rename to esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/KpiApplication.java
index 8032f1958..0d003f3dc 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/epdc/esua/KpiApplication.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/KpiApplication.java
@@ -6,7 +6,7 @@
  * 版权所有，侵权必究！
  */
 
-package com.elink.epdc.esua;
+package com.elink.esua.epdc;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/epdc/esua/config/ModuleConfigImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java
similarity index 93%
rename from esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/epdc/esua/config/ModuleConfigImpl.java
rename to esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java
index 3dd8672dc..6bd7a2a81 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/epdc/esua/config/ModuleConfigImpl.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java
@@ -6,7 +6,7 @@
  * 版权所有，侵权必究！
  */
 
-package com.elink.epdc.esua.config;
+package com.elink.esua.epdc.config;
 
 import com.elink.esua.epdc.commons.tools.config.ModuleConfig;
 import org.springframework.stereotype.Service;
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiFormulaController.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiFormulaController.java
new file mode 100644
index 000000000..45f0ea8e2
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiFormulaController.java
@@ -0,0 +1,93 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.dto.KpiFormulaDTO;
+import com.elink.esua.epdc.excel.KpiFormulaExcel;
+import com.elink.esua.epdc.service.KpiFormulaService;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 绩效考核公式
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2019-11-26
+ */
+@RestController
+@RequestMapping("kpiformula")
+public class KpiFormulaController {
+
+    @Autowired
+    private KpiFormulaService kpiFormulaService;
+
+    @GetMapping("page")
+    public Result<PageData<KpiFormulaDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<KpiFormulaDTO> page = kpiFormulaService.page(params);
+        return new Result<PageData<KpiFormulaDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<KpiFormulaDTO> get(@PathVariable("id") String id){
+        KpiFormulaDTO data = kpiFormulaService.get(id);
+        return new Result<KpiFormulaDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody KpiFormulaDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        //kpiFormulaService.save(dto);
+        return kpiFormulaService.saveKpiFormula(dto);
+    }
+
+    @PutMapping
+    public Result update(@RequestBody KpiFormulaDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        return kpiFormulaService.update(dto);
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        kpiFormulaService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<KpiFormulaDTO> list = kpiFormulaService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, KpiFormulaExcel.class);
+    }
+
+}
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiFormulaDao.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiFormulaDao.java
new file mode 100644
index 000000000..9aa5512f0
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiFormulaDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.dao;
+
+import com.elink.esua.epdc.entity.KpiFormulaEntity;
+import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 绩效考核公式
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2019-11-26
+ */
+@Mapper
+public interface KpiFormulaDao extends BaseDao<KpiFormulaEntity> {
+
+}
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiFormulaEntity.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiFormulaEntity.java
new file mode 100644
index 000000000..90b3f7f87
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiFormulaEntity.java
@@ -0,0 +1,76 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 绩效考核公式
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2019-11-26
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("epdc_kpi_formula")
+public class KpiFormulaEntity extends BaseEpdcEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 公式编码
+     */
+	private String code;
+
+    /**
+     * 公式名称
+     */
+	private String name;
+
+	/**
+	 * 方法名
+	 */
+	private String functionName;
+
+    /**
+     * 公式运行方法（Javascript）
+     */
+	private String formula;
+
+    /**
+     * 公式参数数量
+     */
+	private Integer paramAmount;
+
+    /**
+     * 公式描述
+     */
+	private String description;
+
+    /**
+     * 备注
+     */
+	private String remark;
+
+}
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiFormulaExcel.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiFormulaExcel.java
new file mode 100644
index 000000000..033374b7c
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiFormulaExcel.java
@@ -0,0 +1,74 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 绩效考核公式
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2019-11-26
+ */
+@Data
+public class KpiFormulaExcel {
+
+    @Excel(name = "主键")
+    private String id;
+
+    @Excel(name = "公式编码")
+    private String code;
+
+    @Excel(name = "公式名称")
+    private String name;
+
+    @Excel(name = "公式运行方法（Javascript）")
+    private String formula;
+
+    @Excel(name = "公式参数数量")
+    private Integer paramAmount;
+
+    @Excel(name = "公式描述")
+    private String desc;
+
+    @Excel(name = "备注")
+    private String remark;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+    @Excel(name = "删除标记")
+    private String delFlag;
+
+
+}
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/redis/KpiFormulaRedis.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/redis/KpiFormulaRedis.java
new file mode 100644
index 000000000..74a3ca3ee
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/redis/KpiFormulaRedis.java
@@ -0,0 +1,47 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.redis;
+
+import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 绩效考核公式
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2019-11-26
+ */
+@Component
+public class KpiFormulaRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiFormulaService.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiFormulaService.java
new file mode 100644
index 000000000..f354275eb
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiFormulaService.java
@@ -0,0 +1,106 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.service;
+
+
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.KpiFormulaDTO;
+import com.elink.esua.epdc.entity.KpiFormulaEntity;
+import com.elink.esua.epdc.commons.mybatis.service.BaseService;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 绩效考核公式
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2019-11-26
+ */
+public interface KpiFormulaService extends BaseService<KpiFormulaEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<KpiFormulaDTO>
+     * @author generator
+     * @date 2019-11-26
+     */
+    PageData<KpiFormulaDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<KpiFormulaDTO>
+     * @author generator
+     * @date 2019-11-26
+     */
+    List<KpiFormulaDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return KpiFormulaDTO
+     * @author generator
+     * @date 2019-11-26
+     */
+    KpiFormulaDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2019-11-26
+     */
+    void save(KpiFormulaDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2019-11-26
+     */
+    Result update(KpiFormulaDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2019-11-26
+     */
+    void delete(String[] ids);
+
+    /**
+     * @param dto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author yinzuomei
+     * @Description 新增
+     * @Date 2019/11/26 17:14
+     **/
+    Result saveKpiFormula(KpiFormulaDTO dto);
+}
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiFormulaServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiFormulaServiceImpl.java
new file mode 100644
index 000000000..529fffdcd
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiFormulaServiceImpl.java
@@ -0,0 +1,165 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dao.KpiFormulaDao;
+import com.elink.esua.epdc.dto.KpiFormulaDTO;
+import com.elink.esua.epdc.entity.KpiFormulaEntity;
+import com.elink.esua.epdc.redis.KpiFormulaRedis;
+import com.elink.esua.epdc.service.KpiFormulaService;
+import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
+import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.script.Invocable;
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 绩效考核公式
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2019-11-26
+ */
+@Service
+public class KpiFormulaServiceImpl extends BaseServiceImpl<KpiFormulaDao, KpiFormulaEntity> implements KpiFormulaService {
+
+    @Autowired
+    private KpiFormulaRedis kpiFormulaRedis;
+
+    @Override
+    public PageData<KpiFormulaDTO> page(Map<String, Object> params) {
+        QueryWrapper<KpiFormulaEntity> wrapper=new QueryWrapper<>();
+        String name =(String)params.get(FieldConstant.NAME_HUMP);
+        wrapper.like(StringUtils.isNotBlank(name),FieldConstant.NAME,name);
+
+        IPage<KpiFormulaEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                wrapper
+        );
+        return getPageData(page, KpiFormulaDTO.class);
+    }
+
+    @Override
+    public List<KpiFormulaDTO> list(Map<String, Object> params) {
+        List<KpiFormulaEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, KpiFormulaDTO.class);
+    }
+
+    private QueryWrapper<KpiFormulaEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+        QueryWrapper<KpiFormulaEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+        return wrapper;
+    }
+
+    @Override
+    public KpiFormulaDTO get(String id) {
+        KpiFormulaEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, KpiFormulaDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(KpiFormulaDTO dto) {
+        KpiFormulaEntity entity = ConvertUtils.sourceToTarget(dto, KpiFormulaEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Result update(KpiFormulaDTO dto) {
+        try{
+            if(StringUtils.isNotBlank(dto.getFormula())){
+                //获得一个javascipt的执行引擎
+                ScriptEngine engine = new ScriptEngineManager().getEngineByName("javascript");
+                //执行js代码
+                engine.eval(dto.getFormula());
+                //是否可调用方法
+                boolean flag=engine instanceof Invocable;
+                if(!flag){
+                    return new Result().error("运行方法异常");
+                }
+//                else{
+//                    Invocable in = (Invocable)engine;
+//                    //执行js中的函数
+//                    Double result=(Double) in.invokeFunction(dto.getCode(), 5,2);
+//                    //打印出调用方法的结果：
+//                    System.out.println("的运算结果是："+result);
+//                }
+            }
+        }catch(Exception e){
+            e.printStackTrace();
+            return new Result().error("运行方法异常"+e.getMessage());
+        }
+        KpiFormulaEntity entity = ConvertUtils.sourceToTarget(dto, KpiFormulaEntity.class);
+        updateById(entity);
+        return new Result();
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+    /**
+     * @param dto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author yinzuomei
+     * @Description 新增
+     * @Date 2019/11/26 17:14
+     **/
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Result saveKpiFormula(KpiFormulaDTO dto) {
+        try{
+            if(StringUtils.isNotBlank(dto.getFormula())){
+                //获得一个javascipt的执行引擎
+                ScriptEngine engine = new ScriptEngineManager().getEngineByName("javascript");
+                //执行js代码
+                engine.eval(dto.getFormula());
+                //是否可调用方法
+                boolean flag=engine instanceof Invocable;
+                if(!flag){
+                    return new Result().error("运行方法异常");
+                }
+            }
+        }catch(Exception e){
+            return new Result().error("运行方法异常"+e.getMessage());
+        }
+        KpiFormulaEntity entity = ConvertUtils.sourceToTarget(dto, KpiFormulaEntity.class);
+        insert(entity);
+        return new Result();
+    }
+
+}
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiFormulaDao.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiFormulaDao.xml
new file mode 100644
index 000000000..588afe512
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiFormulaDao.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.elink.esua.epdc.dao.KpiFormulaDao">
+
+    <resultMap type="com.elink.esua.epdc.entity.KpiFormulaEntity" id="kpiFormulaMap">
+        <result property="id" column="ID"/>
+        <result property="code" column="CODE"/>
+        <result property="name" column="NAME"/>
+        <result property="functionName" column="FUNCTION_NAME"/>
+        <result property="formula" column="FORMULA"/>
+        <result property="paramAmount" column="PARAM_AMOUNT"/>
+        <result property="description" column="DESCRIPTION"/>
+        <result property="remark" column="REMARK"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+    </resultMap>
+
+
+</mapper>
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml
index 9f6046fb4..e64a0c1d3 100644
--- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml
@@ -18,11 +18,6 @@
             <artifactId>epdc-news-client</artifactId>
             <version>1.0.0</version>
         </dependency>
-        <dependency>
-            <groupId>com.esua.epdc</groupId>
-            <artifactId>epdc-commons-tools</artifactId>
-            <version>1.0.0</version>
-        </dependency>
         <dependency>
             <groupId>com.esua.epdc</groupId>
             <artifactId>epdc-commons-mybatis</artifactId>
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppRemoveGridFormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppRemoveGridFormDTO.java
index 522858b0e..15d1f9399 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppRemoveGridFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppRemoveGridFormDTO.java
@@ -12,19 +12,16 @@ import java.io.Serializable;
  */
 @Data
 public class EpdcAppRemoveGridFormDTO implements Serializable {
-	private static final long serialVersionUID = 9115962990383560832L;
-	/**
-	 * 网格ID
-	 */
-	@NotBlank(message = "网格ID不能为空")
-	private String gridId;
+    private static final long serialVersionUID = 9115962990383560832L;
+    /**
+     * 网格ID
+     */
+    @NotBlank(message = "网格ID不能为空")
+    private String gridId;
 
-	/**
-	 * 当前登录网格id
-	 */
-	private Long currentLoginGrid;
-	/**
-	 * 用户id
-	 */
-	private String userId;
+    /**
+     * 用户id
+     */
+    @NotBlank(message = "用户ID不能为空")
+    private String userId;
 }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUnauthorizedAmountFromDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUnauthorizedAmountFromDTO.java
index 79eb87c12..071a6ef77 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUnauthorizedAmountFromDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUnauthorizedAmountFromDTO.java
@@ -2,35 +2,29 @@ package com.elink.esua.epdc.dto.epdc.form;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
+import java.util.List;
 
 
 /**
- *  @author: qushutong
- *  @Date: 2019/11/19 19:00
- *  @Description: 查询待认证用户数量
+ * @author: qushutong
+ * @Date: 2019/11/19 19:00
+ * @Description: 查询待认证用户数量
  */
 @Data
 public class EpdcUnauthorizedAmountFromDTO implements Serializable {
     private static final long serialVersionUID = 5060358136725588037L;
 
     /**
-     * 用户id
+     * 网格长管理的所有网格
+     * 查询所有网格的数据时传入
      */
-    @NotBlank(message = "用户ID不能为空")
-    private String userId;
+    private List<Long> gridIdList;
 
     /**
-     * 用户所属网格ID
+     * 网格长管理的某一个网格
+     * 查询单个网格的数据时传入
      */
-    @NotNull(message = "用户网格ID不能为空")
-    private Long deptId;
+    private Long gridId;
 
-    /**
-     * 是否查询用户管理的所有网格的数据 0否 1是
-     */
-    @NotBlank(message = "是否查询用户管理的所有网格的数据不能为空")
-    private String allGridFlag;
 }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcWorkUserFromDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcWorkUserFromDTO.java
index 677e312e2..695a21fc7 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcWorkUserFromDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcWorkUserFromDTO.java
@@ -5,6 +5,7 @@ import lombok.Data;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @author: qushutong
@@ -27,16 +28,10 @@ public class EpdcWorkUserFromDTO implements Serializable {
     private String partyFlag;
 
     /**
-     * 用户id
+     * 用户管理的某个网格
+     * 不传时，查询用户管理的所有网格
      */
-    @NotBlank(message = "用户ID不能为空")
-    private String userId;
-
-    /**
-     * 用户所属网格ID
-     */
-    @NotNull(message = "用户网格ID不能为空")
-    private Long deptId;
+    private Long gridId;
 
     /**
      * 页码
@@ -56,9 +51,7 @@ public class EpdcWorkUserFromDTO implements Serializable {
     @NotBlank(message = "时间戳不能为空")
     private String timestamp;
 
-    /**
-     * 是否查询用户管理的所有网格的数据 0否 1是
-     */
-    @NotBlank(message = "是否查询用户管理的所有网格的数据不能为空")
-    private String allGridFlag;
+
+    private List<Long> gridIdList;
+
 }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcPartyMemberDetailDto.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcPartyMemberDetailDto.java
index 5bcb11eb4..510e5c994 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcPartyMemberDetailDto.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcPartyMemberDetailDto.java
@@ -18,6 +18,10 @@ public class EpdcPartyMemberDetailDto implements Serializable {
      * 真实姓名
      */
     private String realName;
+    /**
+     * 手机号
+     */
+    private String mobile;
     /**
      * 身份证号
      */
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcResidentDetailResultDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcResidentDetailResultDTO.java
index ba396c433..43921ea2c 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcResidentDetailResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcResidentDetailResultDTO.java
@@ -45,6 +45,10 @@ public class EpdcResidentDetailResultDTO implements Serializable {
 	 * 审核状态（1待认证 3已认证）
 	 */
 	private String state;
+	/**
+	 * 用户手机号
+	 */
+	private String mobile;
 	/**
 	 * 扫码网格列表
 	 */
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java
index 945d28812..9976e509e 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java
@@ -293,8 +293,8 @@ public class EpdcAppUserController {
      * @author qushutong
      * @date 2019/11/18 13:47
      */
-    @GetMapping("list")
-    public Result<List<EpdcWorkUserResultDTO>> getWorkUserList(@RequestBody EpdcWorkUserFromDTO workUserFromDto) {
+    @GetMapping("listForWork")
+    public Result<List<EpdcWorkUserResultDTO>> listUserForWork(@RequestBody EpdcWorkUserFromDTO workUserFromDto) {
         return userService.getWorkUserList(workUserFromDto);
     }
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java
index e424c5819..f40974593 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java
@@ -151,5 +151,5 @@ public interface UserDao extends BaseDao<UserEntity> {
      * @author qushutong
      * @date 2019/11/19 13:31
      */
-    Integer selectOneAnauthorizedAmount(EpdcUnauthorizedAmountFromDTO fromDto);
+    int selectOneAnauthorizedAmount(EpdcUnauthorizedAmountFromDTO fromDto);
 }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserGridRelationServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserGridRelationServiceImpl.java
index f7a829378..9ab403d3a 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserGridRelationServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserGridRelationServiceImpl.java
@@ -55,6 +55,7 @@ import java.util.Map;
 public class UserGridRelationServiceImpl extends BaseServiceImpl<UserGridRelationDao, UserGridRelationEntity> implements UserGridRelationService {
     @Autowired
     private RedisUtils redisUtils;
+
     @Override
     public PageData<UserGridRelationDTO> page(Map<String, Object> params) {
         IPage<UserGridRelationEntity> page = baseDao.selectPage(
@@ -174,35 +175,35 @@ public class UserGridRelationServiceImpl extends BaseServiceImpl<UserGridRelatio
      * @Description 解绑
      * @Date 2019/11/21 18:06
      **/
-    @Transactional(rollbackFor = Exception.class)
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void unbindGridHandle(String id) {
         UserGridRelationEntity userGridRelationEntity = this.baseDao.selectById(id);
-//        this.baseDao.deleteById(id);
-        this.delete(userGridRelationEntity.getUserId(),userGridRelationEntity.getGridId());//修改删除标志
+        // 修改删除标志
+        this.delete(userGridRelationEntity.getUserId(), userGridRelationEntity.getGridId());
         String key = RedisKeys.getCpUserKey(userGridRelationEntity.getUserId());
         Map<String, Object> map = redisUtils.hGetAll(key);
         Long currentGridId = userGridRelationEntity.getGridId();
-        if (map.containsKey("gridId") && currentGridId.equals(Long.valueOf(map.get("gridId").toString()))) {
+        if (map.containsKey(FieldConstant.GRID_ID_HUMP) && currentGridId.toString().equals(map.get(FieldConstant.GRID_ID_HUMP).toString())) {
             redisUtils.delete(RedisKeys.getCpUserKey(userGridRelationEntity.getUserId()));
         }
     }
 
-	/**
-	 * @param formDto
-	 * @return com.elink.esua.epdc.commons.tools.utils.Result
-	 * @Author yinzuomei
-	 * @Description 解除与网格的关联
-	 * @Date 2019/11/22 14:31
-	 **/
-	@Override
-	public Result removeGrid(EpdcAppRemoveGridFormDTO formDto) {
-		this.delete(formDto.getUserId(),Long.valueOf(formDto.getGridId()));
-		String key = RedisKeys.getCpUserKey(formDto.getUserId());
-		Map<String, Object> map = redisUtils.hGetAll(key);
-		if (map.containsKey("gridId") && formDto.getCurrentLoginGrid().equals(Long.valueOf(map.get("gridId").toString()))) {
-			redisUtils.delete(RedisKeys.getCpUserKey(formDto.getUserId()));
-		}
-		return new Result();
-	}
+    /**
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author yinzuomei
+     * @Description 解除与网格的关联
+     * @Date 2019/11/22 14:31
+     **/
+    @Override
+    public Result removeGrid(EpdcAppRemoveGridFormDTO formDto) {
+        this.delete(formDto.getUserId(), Long.valueOf(formDto.getGridId()));
+        String key = RedisKeys.getCpUserKey(formDto.getUserId());
+        Map<String, Object> map = redisUtils.hGetAll(key);
+        if (map.containsKey(FieldConstant.GRID_ID_HUMP) && formDto.getGridId().equals(map.get(FieldConstant.GRID_ID_HUMP).toString())) {
+            redisUtils.delete(RedisKeys.getCpUserKey(formDto.getUserId()));
+        }
+        return new Result();
+    }
 }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
index 90d4ea86a..879b2dbc5 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
@@ -58,6 +58,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.validation.constraints.NotBlank;
 import java.util.*;
 
 /**
@@ -111,10 +112,10 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     @Override
     public UserDTO get(String id) {
         UserEntity entity = baseDao.selectById(id);
-        UserDTO resultDTO=ConvertUtils.sourceToTarget(entity, UserDTO.class);
-        resultDTO.setTotalSubmitNum(userAuthenticateHistoryDao.countAuthenticateHistory(id,null));
-        resultDTO.setTotalFailNum(userAuthenticateHistoryDao.countAuthenticateHistory(id,NumConstant.ZERO_STR));//0 未通过1通过
-        resultDTO.setTotalPassSubmitNum(userAuthenticateHistoryDao.countAuthenticateHistory(id,NumConstant.ONE_STR));
+        UserDTO resultDTO = ConvertUtils.sourceToTarget(entity, UserDTO.class);
+        resultDTO.setTotalSubmitNum(userAuthenticateHistoryDao.countAuthenticateHistory(id, null));
+        resultDTO.setTotalFailNum(userAuthenticateHistoryDao.countAuthenticateHistory(id, NumConstant.ZERO_STR));//0 未通过1通过
+        resultDTO.setTotalPassSubmitNum(userAuthenticateHistoryDao.countAuthenticateHistory(id, NumConstant.ONE_STR));
         return resultDTO;
     }
 
@@ -157,16 +158,16 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
             userTagRelationService.save(userTagRelationDTO);
         }*/
         //组装数据并插入用户认证历史表(epdc_user_authenticate_history)
-        UserEntity userEntity=this.baseDao.selectById(entity.getId());
-        UserAuthenticateHistoryEntity userAuthenticateHistoryEntity=new UserAuthenticateHistoryEntity();
+        UserEntity userEntity = this.baseDao.selectById(entity.getId());
+        UserAuthenticateHistoryEntity userAuthenticateHistoryEntity = new UserAuthenticateHistoryEntity();
         userAuthenticateHistoryEntity.setUserId(userEntity.getId());
         userAuthenticateHistoryEntity.setMobile(userEntity.getMobile());
         userAuthenticateHistoryEntity.setRealName(userEntity.getRealName());
         userAuthenticateHistoryEntity.setAddress(userEntity.getAddress());
         userAuthenticateHistoryEntity.setAuthenticatedFlag(userEntity.getState());//状态(0-已注册，1-已完善信息待审核，2-信息审核不通过，3-信息审核通过)
-        if(NumConstant.THREE_STR.equals(entity.getState())){
+        if (NumConstant.THREE_STR.equals(entity.getState())) {
             userAuthenticateHistoryEntity.setAuthenticatedFlag(YesOrNoEnum.YES.value());
-        }else{
+        } else {
             userAuthenticateHistoryEntity.setAuthenticatedFlag(YesOrNoEnum.NO.value());
         }
         userAuthenticateHistoryEntity.setRemark(dto.getRemark());
@@ -473,7 +474,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
                     .eq(UserFieldConsant.REAL_NAME, userDto.getRealName());
             int selectCount = this.partyMembersDao.selectCount(partyWrapper);
             //用户认证历史
-            UserAuthenticateHistoryEntity userAuthenticateHistoryEntity=new UserAuthenticateHistoryEntity();
+            UserAuthenticateHistoryEntity userAuthenticateHistoryEntity = new UserAuthenticateHistoryEntity();
             if (selectCount == NumConstant.ZERO) {
                 // 党员库中没有，存进党员认证失败表
                 PartyAuthenticationFailedEntity authenticationFailedEntity = ConvertUtils.sourceToTarget(partyMembersEntity, PartyAuthenticationFailedEntity.class);
@@ -539,19 +540,20 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         if (StringUtils.isBlank(userId)) {
             return new Result<EpdcResidentDetailResultDTO>().error("用户Id不能为空");
         }
-	    EpdcResidentDetailResultDTO dto = this.baseDao.residentDetailByUserId(userId);
-	    if (null != dto) {
-		    EpdcUserAuthenticateHistoryResultDTO userAuthenticateHistory = new EpdcUserAuthenticateHistoryResultDTO();
-		    userAuthenticateHistory.setTotalSubmitNum(userAuthenticateHistoryDao.countAuthenticateHistory(userId, null));
-		    userAuthenticateHistory.setTotalFailNum(userAuthenticateHistoryDao.countAuthenticateHistory(userId, NumConstant.ZERO_STR));//0 未通过1通过
-		    userAuthenticateHistory.setTotalPassSubmitNum(userAuthenticateHistoryDao.countAuthenticateHistory(userId, NumConstant.ONE_STR));
-		    dto.setAuthenticateHistory(userAuthenticateHistory);
-	    }
+        EpdcResidentDetailResultDTO dto = this.baseDao.residentDetailByUserId(userId);
+        if (null != dto) {
+            EpdcUserAuthenticateHistoryResultDTO userAuthenticateHistory = new EpdcUserAuthenticateHistoryResultDTO();
+            userAuthenticateHistory.setTotalSubmitNum(userAuthenticateHistoryDao.countAuthenticateHistory(userId, null));
+            userAuthenticateHistory.setTotalFailNum(userAuthenticateHistoryDao.countAuthenticateHistory(userId, NumConstant.ZERO_STR));//0 未通过1通过
+            userAuthenticateHistory.setTotalPassSubmitNum(userAuthenticateHistoryDao.countAuthenticateHistory(userId, NumConstant.ONE_STR));
+            dto.setAuthenticateHistory(userAuthenticateHistory);
+        }
         return new Result().ok(dto);
     }
 
     /**
      * 认证用户（用户信息审核）
+     *
      * @param formDTO
      * @return
      */
@@ -569,50 +571,66 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
             } else {
                 throw new RenException("是否认证通过数据不匹配");
             }
-            this.update(userDTO);
+            //插入认证历史表
+            UserAuthenticateHistoryEntity authenticateHistoryEntity = new UserAuthenticateHistoryEntity();
+            authenticateHistoryEntity.setUserId(userDTO.getId());
+            authenticateHistoryEntity.setMobile(userDTO.getMobile());
+            authenticateHistoryEntity.setRealName(userDTO.getRealName());
+            authenticateHistoryEntity.setAddress(userDTO.getAddress());
+            authenticateHistoryEntity.setAuthenticatedFlag(formDTO.getAuthenticatedFlag());//是否认证通过 0未通过1通过
+            //authenticateHistoryEntity.setRemark(userDTO.getRemark());
+            userAuthenticateHistoryDao.insert(authenticateHistoryEntity);
         }
         return new Result();
     }
 
     /**
      * 获取党员详情（已认证或未认证的党员用户）
+     *
      * @param userId
      * @return
      */
     @Override
     public Result<EpdcPartyMemberDetailDto> partyMemberDetail(String userId) {
-        if(StringUtils.isBlank(userId)){
+        if (StringUtils.isBlank(userId)) {
             return new Result<EpdcPartyMemberDetailDto>().error("用户Id不能为空");
         }
         String idNo = baseDao.getPartyMemberIdNoByUserID(userId);
-        if(StringUtils.isBlank(idNo)){
+        if (StringUtils.isBlank(idNo)) {
             return new Result<EpdcPartyMemberDetailDto>().error("用户不是党员或身份证号为空");
         }
         EpdcPartyMemberDetailDto dto = baseDao.partyMemberDetailByUserId(userId);
-        if(dto == null){
+        if (dto == null) {
             dto = baseDao.partyMemberDetailFaild(userId);
         }
-        if(dto != null){
+        if (dto != null) {
             return new Result().ok(dto);
         }
         return new Result<EpdcPartyMemberDetailDto>().error("获取信息失败");
     }
+
     @Override
     public Result<List<EpdcWorkUserResultDTO>> getWorkUserList(EpdcWorkUserFromDTO workUserFromDto) {
         int pageIndex = (workUserFromDto.getPageIndex() - NumConstant.ONE) * workUserFromDto.getPageSize();
         workUserFromDto.setPageIndex(pageIndex);
+
+        String partyFlag = workUserFromDto.getPartyFlag();
         String authenticatedFlag = workUserFromDto.getAuthenticatedFlag();
-        if (YesOrNoEnum.NO.value().equals(authenticatedFlag)) {
-            authenticatedFlag = NumConstant.ONE_STR;
-        } else if (YesOrNoEnum.YES.value().equals(authenticatedFlag)) {
-            authenticatedFlag = NumConstant.THREE_STR;
-        } else {
-            throw new RenException("数据不匹配");
+
+
+        // 查询认证成的居民或党员
+        String state = AppUserStatesEnum.STATE_INFORMATION_PASSED.value();
+        // 查询待认证的居民
+        if (YesOrNoEnum.NO.value().equals(partyFlag) && YesOrNoEnum.NO.equals(authenticatedFlag)) {
+            state = AppUserStatesEnum.STATE_COMPLETED_INFORMATION_PENDING_REVIEW.value();
+        }
+        // 查询认证失败的党员
+        if (YesOrNoEnum.YES.value().equals(partyFlag) && YesOrNoEnum.NO.equals(authenticatedFlag)) {
+            state = AppUserStatesEnum.STATE_INFORMATION_NOT_PASSED.value();
         }
-        workUserFromDto.setAuthenticatedFlag(authenticatedFlag);
+        workUserFromDto.setAuthenticatedFlag(state);
 
         List<EpdcWorkUserResultDTO> epdcWorkUserResultDTOS = baseDao.selectWorkUserList(workUserFromDto);
-
         return new Result<List<EpdcWorkUserResultDTO>>().ok(epdcWorkUserResultDTOS);
     }
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
index d6e69cf1b..561316b1a 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
@@ -105,6 +105,7 @@
         <result column="DWELLING_PLACE" property="dwellingPlace"/>
         <result column="PARTY_FLAG" property="partyFlag"/>
         <result column="state" property="state"/>
+        <result column="mobile" property="mobile"/>
         <collection property="gridList" ofType="com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailGridResultDTO">
             <result column="completeName" property="completeName"/>
             <result column="leaderFlag" property="leaderFlag"/>
@@ -120,6 +121,7 @@
             eu.DWELLING_PLACE,
             eu.PARTY_FLAG ,
             eu.state,
+            eu.mobile,
             CONCAT_WS('-',eugr.STREET,eugr.COMMUNITY,eugr.GRID) as completeName,
             eugr.LEADER_FLAG as leaderFlag
         FROM
@@ -190,6 +192,7 @@
             eu.REAL_NAME AS realName,
             eu.IDENTITY_NO AS identityNo,
             eu.ROAD AS road,
+            eu.MOBILE as mobile,
             eu.VILLAGE_NAME AS villageName,
             eu.DWELLING_PLACE as dwellingPlace,
             '1' as authenticatedFlag,
@@ -256,54 +259,52 @@
             AND eu.id = #{userId}
     </select>
 
-
     <!--获取用户列表-->
     <select id="selectWorkUserList" resultType="com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO">
         SELECT
-        u.ID as userId,
-        u.NICKNAME as nickname,
-        u.REGISTER_TIME as registerTime,
-        u.FACE_IMG as faceImg
+            u.ID as userId,
+            u.NICKNAME as nickname,
+            u.REGISTER_TIME as registerTime,
+            u.FACE_IMG as faceImg
         FROM
-        epdc_user_grid_relation ug_l
-        LEFT JOIN epdc_user_grid_relation ug_r ON ug_l.GRID_ID = ug_r.GRID_ID
-        LEFT JOIN epdc_user u ON ug_r.USER_ID = u.ID
+            epdc_user_grid_relation ug
+            LEFT JOIN epdc_user u ON ug.USER_ID = u.ID
         WHERE
-        ug_l.USER_ID = #{userId}
-        AND ug_l.LEADER_FLAG = '1'
-        AND u.STATE = #{authenticatedFlag}
-        AND u.PART_FLAG = #{partyFlag}
-        <if test='allGridFlag=="0"'>
-            AND ug_r.GRID_ID = #{deptId}
-        </if>
-        AND u.CREATED_TIME &lt;= STR_TO_DATE( #{timestamp}, '%Y-%m-%d %H:%i:%s' )
-        AND ug_l.DEL_FLAG = '0'
-        AND ug_r.DEL_FLAG = '0'
-        AND u.DEL_FLAG = '0'
+            u.PART_FLAG = #{partyFlag}
+            AND u.STATE = #{authenticatedFlag}
+            AND u.DEL_FLAG = '0'
+            AND ug.DEL_FLAG = '0'
+            <choose>
+                <when test="gridId != null">AND ug.GRID_ID = #{gridId}</when>
+                <otherwise>
+                    AND ug.GRID_ID in
+                    <foreach collection="gridIdList" item="item" open="(" separator="," close=")" >
+                        #{item}
+                    </foreach>
+                </otherwise>
+            </choose>
         GROUP BY
-        u.ID
-        ORDER BY
-        u.CREATED_TIME DESC
+            u.ID
+        ORDER BY u.CREATED_TIME DESC
         LIMIT #{pageIndex},#{pageSize}
     </select>
 
     <!--查询待认证用户数量-->
     <select id="selectOneAnauthorizedAmount" resultType="Integer">
         SELECT
-        COUNT(u.ID)
+            COUNT(DISTINCT(u.ID))
         FROM
-        epdc_user_grid_relation ug_l
-        LEFT JOIN epdc_user_grid_relation ug_r ON ug_l.GRID_ID = ug_r.GRID_ID
-        LEFT JOIN epdc_user u ON ug_r.USER_ID = u.ID
-        WHERE
-        ug_l.USER_ID = #{userId}
-        AND ug_l.LEADER_FLAG = '1'
-        AND u.STATE = '1'
-        <if test='allGridFlag=="0"'>
-            AND ug_r.GRID_ID = #{deptId}
-        </if>
-        AND ug_l.DEL_FLAG = '0'
-        AND ug_r.DEL_FLAG = '0'
-        AND u.DEL_FLAG = '0'
+            epdc_user_grid_relation ug
+            LEFT JOIN epdc_user u ON u.ID = ug.USER_ID
+        WHERE u.DEL_FLAG = '0' AND ug.DEL_FLAG = '0' AND u.STATE = '1'
+            <choose>
+                <when test="gridId != null">AND ug.GRID_ID = #{gridId}</when>
+                <otherwise>
+                    AND ug.GRID_ID in
+                    <foreach collection="gridIdList" item="item" open="(" separator="," close=")" >
+                        #{item}
+                    </foreach>
+                </otherwise>
+            </choose>
     </select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/esua-epdc/pom.xml b/esua-epdc/pom.xml
index 9caf6bf03..3668dc3b2 100644
--- a/esua-epdc/pom.xml
+++ b/esua-epdc/pom.xml
@@ -96,19 +96,19 @@
         <repository>
             <id>public</id>
             <name>aliyun nexus</name>
-            <url>http://47.104.224.45:9002/repository/maven-public/</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-        </repository>
-        <repository>
-            <id>elink-release</id>
-            <name>aliyun nexus</name>
-            <url>http://47.104.224.45:9002/repository/elink-release/</url>
+            <url>http://47.104.85.99:9002/repository/maven-public/</url>
             <releases>
                 <enabled>true</enabled>
             </releases>
         </repository>
+<!--        <repository>-->
+<!--            <id>elink-release</id>-->
+<!--            <name>aliyun nexus</name>-->
+<!--            <url>http://47.104.224.45:9002/repository/elink-release/</url>-->
+<!--            <releases>-->
+<!--                <enabled>true</enabled>-->
+<!--            </releases>-->
+<!--        </repository>-->
         <repository>
             <id>sonatype</id>
             <name>sonatype nexus</name>
@@ -122,7 +122,7 @@
         <pluginRepository>
             <id>public</id>
             <name>aliyun nexus</name>
-            <url>http://47.104.224.45:9002/repository/maven-public/</url>
+            <url>http://47.104.85.99:9002/repository/maven-public/</url>
             <releases>
                 <enabled>true</enabled>
             </releases>