diff --git a/epmet-admin/epmet-admin-server/src/main/resources/logback-spring.xml b/epmet-admin/epmet-admin-server/src/main/resources/logback-spring.xml
index 3d27fa4d07..2b7d942e79 100644
--- a/epmet-admin/epmet-admin-server/src/main/resources/logback-spring.xml
+++ b/epmet-admin/epmet-admin-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/admin"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/admin"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
 
diff --git a/epmet-auth/src/main/resources/logback-spring.xml b/epmet-auth/src/main/resources/logback-spring.xml
index 3ddc774384..10e7129112 100644
--- a/epmet-auth/src/main/resources/logback-spring.xml
+++ b/epmet-auth/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/auth"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/auth"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-gateway/src/main/resources/logback-spring.xml b/epmet-gateway/src/main/resources/logback-spring.xml
index 1e050e9686..652ce500c4 100644
--- a/epmet-gateway/src/main/resources/logback-spring.xml
+++ b/epmet-gateway/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/gateway"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/gateway"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/logback-spring.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/logback-spring.xml
index c639482221..d1cb010d4f 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/data-aggregator"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/data-aggregator"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml b/epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml
index 86de057fc6..53c7e59c69 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/data-report"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/data-report"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml
index 7d2b7648a3..c320f80c0d 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/data-statistical"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/data-statistical"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/logback-spring.xml
index 280e9f4bb2..c639444cee 100644
--- a/epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/activiti"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/activiti"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
 
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-common-service/common-service-server/src/main/resources/logback-spring.xml
index dbd4fe85bb..9102439017 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/common-service"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/common-service"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-module/epmet-demo/epmet-demo-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-demo/epmet-demo-server/src/main/resources/logback-spring.xml
index 1b8b94ba78..4f79c1b027 100644
--- a/epmet-module/epmet-demo/epmet-demo-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/demo"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/demo"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
 
diff --git a/epmet-module/epmet-ext/epmet-ext-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-ext/epmet-ext-server/src/main/resources/logback-spring.xml
index 8f428f8d5f..aa0f9f0a7b 100644
--- a/epmet-module/epmet-ext/epmet-ext-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/epmet-ext/epmet-ext-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/ext"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/ext"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/logback-spring.xml
index b03ee98c4c..2239f625db 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/heart"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/heart"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordV2Dao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordV2Dao.xml
index 89f8764a30..05bcf1ad4b 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordV2Dao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordV2Dao.xml
@@ -40,7 +40,7 @@
             <if test='serviceTimeEnd != null and serviceTimeEnd != ""'>
                 AND sr.SERVICE_TIME_END <![CDATA[ <= ]]> #{serviceTimeEnd}
             </if>
-        ORDER BY sr.CREATED_TIME DESC
+        ORDER BY sr.SERVICE_TIME_START DESC,sr.SERVICE_TIME_END DESC
     </select>
 
 
diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-job/epmet-job-server/src/main/resources/logback-spring.xml
index 36cbaf8d12..999b42342b 100644
--- a/epmet-module/epmet-job/epmet-job-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/epmet-job/epmet-job-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/job"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/job"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/logback-spring.xml
index 338e0b9495..ddb20915c4 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/message"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/message"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/logback-spring.xml
index 8a71d1a810..d18ef07d28 100644
--- a/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/oss"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/oss"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/logback-spring.xml
index e279b43303..81366ebe09 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/point"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/point"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/logback-spring.xml
index f8e2164fb7..70dde2e876 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/third"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/third"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/logback-spring.xml b/epmet-module/gov-access/gov-access-server/src/main/resources/logback-spring.xml
index 9070f33f63..521b890c6c 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/gov-access/gov-access-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/gov-access"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/gov-access"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
 
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/resources/logback-spring.xml b/epmet-module/gov-grid/gov-grid-server/src/main/resources/logback-spring.xml
index b54d66f380..d0e5f2b64c 100644
--- a/epmet-module/gov-grid/gov-grid-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/gov-grid"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/gov-grid"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/logback-spring.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/logback-spring.xml
index 26e92fef88..d31ef9d410 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/gov-issue"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/gov-issue"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-module/gov-mine/gov-mine-server/src/main/resources/logback-spring.xml b/epmet-module/gov-mine/gov-mine-server/src/main/resources/logback-spring.xml
index 33466c3178..31d1a8af02 100644
--- a/epmet-module/gov-mine/gov-mine-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/gov-mine/gov-mine-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/gov-mine"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/gov-mine"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java
index becc763ba3..55bbb1d60f 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java
@@ -5,7 +5,6 @@ import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 
 
 /**
@@ -59,9 +58,9 @@ public class EnterpriseImportExcelDTO {
      * 4:100人以上】
      * 改为手输数字了
      */
-    @NotNull(message = "规模不能为空")
+    @NotBlank(message = "规模不能为空")
     @ExcelProperty(value = "规模")
-    private Integer scaleTotal;
+    private String scaleTotal;
 
     /**
      * 场所负责人
@@ -110,7 +109,7 @@ public class EnterpriseImportExcelDTO {
 
         @ColumnWidth(20)
         @ExcelProperty(value = "规模")
-        private Integer scaleTotal;
+        private String scaleTotal;
 
         @ColumnWidth(20)
         @ExcelProperty(value = "负责人")
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcEnterpriseExcelImportListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcEnterpriseExcelImportListener.java
index 5495dd6ff6..99a76ad94e 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcEnterpriseExcelImportListener.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcEnterpriseExcelImportListener.java
@@ -5,6 +5,8 @@ import com.alibaba.excel.read.listener.ReadListener;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.exception.ValidateException;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -67,11 +69,16 @@ public class IcEnterpriseExcelImportListener implements ReadListener<EnterpriseI
             // log.warn("有数据吗？"+JSON.toJSONString(data));
             // 不能为空先校验数据
             ValidatorUtils.validateEntity(data);
+            try {
+                Integer.parseInt(data.getScaleTotal());
+            } catch (NumberFormatException e) {
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "", "规模请正确填写场所人数");
+            }
             // 去除空格
             ObjectUtil.objectToTrim(data);
             // 根据网格名是否能找到网格id
             if (!gridMap.containsKey(data.getGridName())) {
-                throw new ValidateException(String.format("您所在的组织，不存在【%s】", data.getGridName()));
+                throw new ValidateException(String.format("场所区域为网格名称，您所在的组织，不存在【%s】", data.getGridName()));
             }
             if(!placeTypeMap.containsKey(data.getPlaceTypeName())){
                 throw new ValidateException(String.format("【%s】场所类型不存在",data.getPlaceTypeName()));
@@ -92,7 +99,7 @@ public class IcEnterpriseExcelImportListener implements ReadListener<EnterpriseI
             enterpriseEntity.setLatitude(StrConstant.EPMETY_STR);
             //规模
             // enterpriseEntity.setScale(scaleMap.get(data.getScaleName()));
-            enterpriseEntity.setScaleTotal(data.getScaleTotal());
+            enterpriseEntity.setScaleTotal(Integer.valueOf(data.getScaleTotal()));
             enterpriseEntity.setPlaceCategory("九小场所".equals(data.getPlaceCategoryName()) ? "0" : "1");
 
             //网格id+场所名称
@@ -118,7 +125,9 @@ public class IcEnterpriseExcelImportListener implements ReadListener<EnterpriseI
             String errorMsg = null;
             if (e instanceof ValidateException) {
                 errorMsg = ((ValidateException) e).getMsg();
-            } else {
+            }else if(e instanceof EpmetException){
+                errorMsg=((EpmetException) e).getMsg();
+            }else {
                 errorMsg = "未知错误";
                 log.error("【企事业单位导入】出错:{}", ExceptionUtils.getErrorStackTrace(e));
             }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java
index 7867b1434b..48cd614b50 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEnterpriseServiceImpl.java
@@ -3,6 +3,7 @@ package com.epmet.service.impl;
 import com.alibaba.excel.EasyExcel;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.aop.NoRepeatSubmit;
@@ -170,7 +171,16 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl<IcEnterpriseDao, Ic
             enterprisePatrolRecordDao.insert(patrolRecordEntity);
         } else {
             patrolRecordEntity.setId(formDTO.getPatrolId());
-            enterprisePatrolRecordDao.updateById(patrolRecordEntity);
+            LambdaUpdateWrapper<IcEnterprisePatrolRecordEntity> update=new LambdaUpdateWrapper<>();
+            update.eq(IcEnterprisePatrolRecordEntity::getId, formDTO.getPatrolId())
+                    .set(IcEnterprisePatrolRecordEntity::getPatrolTime, formDTO.getPatrolTime())
+                    .set(IcEnterprisePatrolRecordEntity::getStaffId, formDTO.getStaffId())
+                    .set(IcEnterprisePatrolRecordEntity::getStaffName, formDTO.getStaffName())
+                    .set(IcEnterprisePatrolRecordEntity::getMobile, formDTO.getMobile())
+                    .set(IcEnterprisePatrolRecordEntity::getResult, formDTO.getResult())
+                    .set(IcEnterprisePatrolRecordEntity::getDetailed, formDTO.getDetailed())
+                    .set(IcEnterprisePatrolRecordEntity::getReviewTime, formDTO.getReviewTime());
+            enterprisePatrolRecordDao.update(null,update);
             //删除之前的图片
             enterprisePatrolAttachmentDao.deleteByPatrolId(formDTO.getPatrolId(), formDTO.getUserId());
         }
@@ -187,7 +197,19 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl<IcEnterpriseDao, Ic
             sort++;
         }
         // 更新主表的最新结果和最新检查时间
-        baseDao.updateLatestPatrol(formDTO.getEnterpriseId(), patrolRecordEntity.getPatrolTime(), patrolRecordEntity.getResult(), formDTO.getUserId());
+        // 获取一下最新的巡检时间和巡检结果
+        LambdaQueryWrapper<IcEnterprisePatrolRecordEntity> queryWrapper = new LambdaQueryWrapper();
+        queryWrapper.eq(IcEnterprisePatrolRecordEntity::getEnterpriseId, formDTO.getEnterpriseId())
+                .orderByDesc(IcEnterprisePatrolRecordEntity::getPatrolTime)
+                .orderByDesc(IcEnterprisePatrolRecordEntity::getCreatedTime)
+                .last("limit 1");
+        IcEnterprisePatrolRecordEntity latestPatrol = enterprisePatrolRecordDao.selectOne(queryWrapper);
+        if (null != latestPatrol) {
+            // 更新主表的最新结果和最新检查时间
+            baseDao.updateLatestPatrol(formDTO.getEnterpriseId(), latestPatrol.getPatrolTime(), latestPatrol.getResult(), formDTO.getUserId());
+        }else{
+            baseDao.updateLatestPatrol(formDTO.getEnterpriseId(), null, StrConstant.EPMETY_STR, formDTO.getUserId());
+        }
         return patrolRecordEntity.getId();
     }
 
@@ -203,14 +225,27 @@ public class IcEnterpriseServiceImpl extends BaseServiceImpl<IcEnterpriseDao, Ic
         if (null == origin) {
             return;
         }
+        Date nowTime=new Date();
         //1、删除巡查记录
-        enterprisePatrolRecordDao.deleteById(patrolId);
+        LambdaUpdateWrapper<IcEnterprisePatrolRecordEntity> patrolUpdate = new LambdaUpdateWrapper<>();
+        patrolUpdate.eq(IcEnterprisePatrolRecordEntity::getId, patrolId)
+                .set(IcEnterprisePatrolRecordEntity::getUpdatedBy, currentUserId)
+                .set(IcEnterprisePatrolRecordEntity::getUpdatedTime, nowTime)
+                .set(IcEnterprisePatrolRecordEntity::getDelFlag, NumConstant.ONE_STR);
+        enterprisePatrolRecordDao.update(null, patrolUpdate);
         //2、删除之前的图片
         enterprisePatrolAttachmentDao.deleteByPatrolId(patrolId, currentUserId);
-        //3、如果是记录清空，那主表的最近一次巡查时间和最新结果也置空
+        // 3、如果是记录清空，那主表的最近一次巡查时间和最新结果也置空
         LambdaQueryWrapper<IcEnterprisePatrolRecordEntity> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(IcEnterprisePatrolRecordEntity::getEnterpriseId, origin.getEnterpriseId());
-        if (NumConstant.ZERO == enterprisePatrolRecordDao.selectCount(queryWrapper)) {
+        queryWrapper.eq(IcEnterprisePatrolRecordEntity::getEnterpriseId, origin.getEnterpriseId())
+                .orderByDesc(IcEnterprisePatrolRecordEntity::getPatrolTime)
+                .orderByDesc(IcEnterprisePatrolRecordEntity::getCreatedTime)
+                .last("limit 1");
+        IcEnterprisePatrolRecordEntity latestPatrol = enterprisePatrolRecordDao.selectOne(queryWrapper);
+        if (null != latestPatrol) {
+            // 更新主表的最新结果和最新检查时间
+            baseDao.updateLatestPatrol(origin.getEnterpriseId(), latestPatrol.getPatrolTime(), latestPatrol.getResult(), currentUserId);
+        } else {
             baseDao.updateLatestPatrol(origin.getEnterpriseId(), null, StrConstant.EPMETY_STR, currentUserId);
         }
     }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/enterprise_patrol_import_tem.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/enterprise_patrol_import_tem.xlsx
index 6981727e9b..7b748c289e 100644
Binary files a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/enterprise_patrol_import_tem.xlsx and b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/enterprise_patrol_import_tem.xlsx differ
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/logback-spring.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/logback-spring.xml
index f366605fba..5371a1f541 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/gov-org"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/gov-org"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/logback-spring.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/logback-spring.xml
index a1e8c5f1b0..ad19a235ae 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/gov-project"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/gov-project"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml
index d7e0d5ff39..546c52b88f 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml
@@ -247,7 +247,7 @@
                 #{secondId}
             </foreach>
         </if>
-        order by ie.created_time desc, ie.latest_operated_time desc
+        order by ie.happen_time desc, ie.latest_operated_time desc
     </select>
 
     <select id="listEventsByPCategoryInOrg" resultType="com.epmet.dto.result.IcEventResultDTO">
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/logback-spring.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/logback-spring.xml
index 6c230be6bf..c26e31a513 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/gov-voice"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/gov-voice"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/logback-spring.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/logback-spring.xml
index 36ddc6f222..03c538fdc0 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/open-data"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/open-data"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
 
diff --git a/epmet-module/oper-access/oper-access-server/src/main/resources/logback-spring.xml b/epmet-module/oper-access/oper-access-server/src/main/resources/logback-spring.xml
index e22bb16a66..080c035973 100644
--- a/epmet-module/oper-access/oper-access-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/oper-access/oper-access-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/oper-access"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/oper-access"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/resources/logback-spring.xml b/epmet-module/oper-crm/oper-crm-server/src/main/resources/logback-spring.xml
index b670ba07bf..5a0f538ff1 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/oper-crm"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/oper-crm"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/logback-spring.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/logback-spring.xml
index cedd663d22..40a734010f 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/oper-customize"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/oper-customize"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/logback-spring.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/logback-spring.xml
index 6a517afaff..bbc34e798a 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/resi-group"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/resi-group"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/resources/logback-spring.xml b/epmet-module/resi-guide/resi-guide-server/src/main/resources/logback-spring.xml
index 126316c645..a42f347111 100644
--- a/epmet-module/resi-guide/resi-guide-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/resi-guide"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/resi-guide"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/resources/logback-spring.xml b/epmet-module/resi-hall/resi-hall-server/src/main/resources/logback-spring.xml
index a5db66cb09..049506c162 100644
--- a/epmet-module/resi-hall/resi-hall-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/resi-hall"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/resi-hall"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-module/resi-home/resi-home-server/src/main/resources/logback-spring.xml b/epmet-module/resi-home/resi-home-server/src/main/resources/logback-spring.xml
index 0b5eedfde0..490067bb31 100644
--- a/epmet-module/resi-home/resi-home-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/resi-home/resi-home-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/resi-home"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/resi-home"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/resources/logback-spring.xml b/epmet-module/resi-mine/resi-mine-server/src/main/resources/logback-spring.xml
index f797654dbd..a0c67122f7 100644
--- a/epmet-module/resi-mine/resi-mine-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/resi-mine"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/resi-mine"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/logback-spring.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/logback-spring.xml
index b8b3161188..1bc47d8520 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/resi-partymember"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/resi-partymember"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-module/resi-voice/resi-voice-server/src/main/resources/logback-spring.xml b/epmet-module/resi-voice/resi-voice-server/src/main/resources/logback-spring.xml
index 408ee874df..a69c72cdd0 100644
--- a/epmet-module/resi-voice/resi-voice-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/resi-voice/resi-voice-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/resi-voice"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/resi-voice"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/remote/EpmetUserRemoteService.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/remote/EpmetUserRemoteService.java
new file mode 100644
index 0000000000..29758a6edf
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/remote/EpmetUserRemoteService.java
@@ -0,0 +1,35 @@
+package com.epmet.remote;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.feign.ResultDataResolver;
+import com.epmet.commons.tools.utils.EpmetRequestHolder;
+import com.epmet.dto.form.LoginUserDetailsFormDTO;
+import com.epmet.dto.result.LoginUserDetailsResultDTO;
+import com.epmet.feign.EpmetUserOpenFeignClient;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * epmet用户远程服务工具
+ */
+@Component
+public class EpmetUserRemoteService implements ResultDataResolver {
+
+    @Autowired
+    private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
+
+    /**
+     * 查询当前登录用户信息
+     * @return
+     */
+    public LoginUserDetailsResultDTO getLoginUserDetails() {
+        //    不传组织id，则基于当前组织查询
+        LoginUserDetailsFormDTO loinUserForm = new LoginUserDetailsFormDTO();
+        loinUserForm.setApp(EpmetRequestHolder.getLoginUserApp());
+        loinUserForm.setClient(EpmetRequestHolder.getLoginUserClient());
+        loinUserForm.setUserId(EpmetRequestHolder.getLoginUserId());
+        LoginUserDetailsResultDTO loginUserDetailsResultDTO = getResultDataOrThrowsException(epmetUserOpenFeignClient.getLoginUserDetails(loinUserForm), ServiceConstant.GOV_ORG_SERVER,
+                null, null, "查询当前工作人员所属组织信息失败");
+        return loginUserDetailsResultDTO;
+    }
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
index 9930c7338f..dba99aadfa 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
@@ -61,6 +61,17 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
      **/
     void upTable(@Param("tableName") String tableName, @Param("id") String id, @Param("map") Map<String, ?> map);
 
+    /**
+     * @description: 选择性更新（只更新不为null的）
+     * @param tableName:
+     * @param id:
+     * @param map:
+     * @return
+     * @author: WangXianZhang
+     * @date: 2023/4/23 9:03 PM
+     */
+    void updateTableSelective(@Param("tableName") String tableName, @Param("id") String id, @Param("map") Map<String, ?> map);
+
     List<Map<String, Object>> selectListResiMap(@Param("customerId") String customerId,
                                                 @Param("formCode") String formCode,
                                                 @Param("conditions") List<ResiUserQueryValueDTO> conditions,
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java
index 7611a80a9f..a78fae885d 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java
@@ -42,12 +42,12 @@ public class IcResiUserEntity extends BaseEpmetEntity {
 	private String customerId;
 
     /**
-     *
+     * 组织Id
      */
 	private String agencyId;
 
     /**
-     *
+     * 组织的pids 含agencyId本身
      */
 	private String pids;
 
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java
index c519210d7b..bfecfa4671 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java
@@ -15,6 +15,7 @@ import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.PidUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.IcResiCollectDao;
 import com.epmet.dao.IcResiMemberDao;
@@ -491,8 +492,12 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
                 throw new EpmetException(EpmetErrorCode.ORG_ADD_FAILED.getCode(), errorMsg, errorMsg);
             }
         }
-
-        userEntity.setPids(icResiCollectEntity.getPids() + ":" + icResiCollectEntity.getAgencyId()); // ic_resi_user表的组织的pids 含agencyId本身
+        AgencyInfoCache agencyInfoCache = CustomerOrgRedis.getAgencyInfo(icResiCollectEntity.getAgencyId());
+        if (null == agencyInfoCache) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "所属组织查询异常,agencyId:" + icResiCollectEntity.getAgencyId(), "所属组织查询异常");
+        }
+        // userEntity.setPids(icResiCollectEntity.getPids() + ":" + icResiCollectEntity.getAgencyId()); // ic_resi_user表的组织的pids 含agencyId本身
+        userEntity.setPids(PidUtils.convertPid2OrgIdPath(icResiCollectEntity.getAgencyId(), agencyInfoCache.getPids()));
         userEntity.setAgencyId(icResiCollectEntity.getAgencyId());
         userEntity.setGridId(icResiCollectEntity.getGridId());
         userEntity.setVillageId(icResiCollectEntity.getVillageId());
@@ -547,7 +552,12 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
 
         // 新增人员
         IcResiUserEntity userEntity = new IcResiUserEntity();
-        userEntity.setPids(icResiCollectEntity.getPids() + ":" + icResiCollectEntity.getAgencyId()); // ic_resi_user表的组织的pids 含agencyId本身
+        AgencyInfoCache agencyInfoCache = CustomerOrgRedis.getAgencyInfo(icResiCollectEntity.getAgencyId());
+        if (null == agencyInfoCache) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "所属组织查询异常,agencyId:" + icResiCollectEntity.getAgencyId(), "所属组织查询异常");
+        }
+        // userEntity.setPids(icResiCollectEntity.getPids() + ":" + icResiCollectEntity.getAgencyId()); // ic_resi_user表的组织的pids 含agencyId本身 !!!
+        userEntity.setPids(PidUtils.convertPid2OrgIdPath(icResiCollectEntity.getAgencyId(), agencyInfoCache.getPids()));
         userEntity.setAgencyId(icResiCollectEntity.getAgencyId());
         userEntity.setGridId(icResiCollectEntity.getGridId());
         userEntity.setVillageId(icResiCollectEntity.getVillageId());
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
index 05e7b81853..e0b5c91837 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
@@ -547,7 +547,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
 
                 if (existingResiMap != null) {
                     // 修改居民信息
-                    icResiUserDao.upTable(tableName, existingResiMap.get("ID"), columnAndValues);
+                    icResiUserDao.updateTableSelective(tableName, existingResiMap.get("ID"), columnAndValues);
 
                     // 任意组织维度一个发生变化，则放到调动居民缓存中
                     ResiImportChangedData transferData;
@@ -747,7 +747,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
                 if (CollectionUtils.isNotEmpty(subInfos)) {
                     Map<String, Object> subInfo = subInfos.get(0);
                     // 附加信息存在，更新附加表内容
-                    icResiUserDao.upTable(targetTableName, subInfo.get("ID").toString(), columnAndValues);
+                    icResiUserDao.updateTableSelective(targetTableName, subInfo.get("ID").toString(), columnAndValues);
                 } else {
                     // 新增附加表信息
                     columnAndValues.put("CREATED_BY", currentUserId);
@@ -1577,7 +1577,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
     private void updateMainTableResiTypeFlag(IcResiUserTableEnum icResiUserTableEnum, String resiUserId) {
         HashMap<String, Boolean> map = new HashMap<>();
         map.put(icResiUserTableEnum.getMainTableFlagColumnName(), true);
-        icResiUserDao.upTable(IcResiUserTableEnum.IC_RESI_USER.getTableName(), resiUserId, map);
+        icResiUserDao.updateTableSelective(IcResiUserTableEnum.IC_RESI_USER.getTableName(), resiUserId, map);
     }
 
     /**
diff --git a/epmet-user/epmet-user-server/src/main/resources/logback-spring.xml b/epmet-user/epmet-user-server/src/main/resources/logback-spring.xml
index 899eed6c7a..a3b40f72e6 100644
--- a/epmet-user/epmet-user-server/src/main/resources/logback-spring.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/logback-spring.xml
@@ -3,7 +3,8 @@
     <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
     <include resource="logback-base.xml"/>
 
-    <property name="log.path" value="logs/epmetuser"/>
+        <!-- 统一调整Logback日志输出目录，执行jvm参数传入。默认./logs/myservice。参数指定方式：-Dlog.dir=/Volumes/data/epmetlog，则会打印到/Volumes/data/epmetlog/myservice。最后不要加/ -->
+    <property name="log.path" value="${log.dir:-logs}/epmetuser"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
index 2d2e30535f..118c0c3c36 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
@@ -73,6 +73,19 @@
         WHERE id = #{id}
     </update>
 
+    <!-- 选择性更新（只更新不为null的） -->
+    <update id="updateTableSelective">
+        UPDATE ${tableName}
+        SET
+        <foreach collection="map.entrySet()" index="key" item="value" separator=",">
+            <if test="value != null and value != ''">
+                ${key} = #{value}
+            </if>
+        </foreach>
+        ,UPDATED_TIME = NOW()
+        WHERE id = #{id}
+    </update>
+
 
     <select id="selectListMapById" parameterType="map" resultType="map">
         select * from ic_resi_user where del_flag='0' and id=#{icResiUserId} and customer_id=#{customerId}