Merge branch 'lingshan_master' into dev

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"/>
 

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"/>

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"/>

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"/>

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"/>

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"/>

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"/>
 

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"/>

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"/>
 

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"/>

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"/>

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"/>

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"/>

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"/>

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"/>

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"/>

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"/>
 

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"/>

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"/>

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"/>

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"/>

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"/>

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"/>

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"/>
 

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"/>

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"/>

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"/>

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"/>

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"/>

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"/>

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"/>

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"/>

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"/>

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"/>

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcSpecialDao.java

@@ -14,7 +14,8 @@ public interface IcSpecialDao extends BaseDao<IcSpecialEntity> {
     public IcSpecialEntity selectByResiId(@Param("resiId") String resiId);
 
     List<LingShanSpecialCrowdListResultDTO> listSpecialCrowd(@Param("orgIdPath") String orgIdPath,
-                                                             @Param("agencyId") String agencyId,
+                                                             @Param("orgId") String orgId,
+                                                             @Param("orgType") String orgType,
                                                              @Param("specialType") String specialType,
                                                              @Param("name") String name,
                                                              @Param("mobile") String mobile,

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/LingShanSpecialCrowdServiceImpl.java

@@ -612,10 +612,12 @@ public class LingShanSpecialCrowdServiceImpl implements LingShanSpecialCrowdServ
         if (StringUtils.isNotBlank(orgId)) {
             orgIdPath = CustomerOrgRedis.getOrgIdPath(orgId, orgType);
         } else {
-             orgIdPath = epmetUserRemoteService.getLoginUserDetails().getOrgIdPath();
+             // 前端没传递，那就用当前staff所属的
+            orgIdPath = epmetUserRemoteService.getLoginUserDetails().getOrgIdPath();
+            orgType = "agency";
         }
         PageHelper.startPage(pageNo, pageSize);
-        List<LingShanSpecialCrowdListResultDTO> l = icSpecialDao.listSpecialCrowd(orgIdPath, orgType, specialType, name, mobile, idCard);
+        List<LingShanSpecialCrowdListResultDTO> l = icSpecialDao.listSpecialCrowd(orgIdPath, orgId, orgType, specialType, name, mobile, idCard);
         // List<LingShanSpecialCrowdListResultDTO> l = specialCrowdPersonTypeDao.listSpecialCrowds(orgIdPath, orgType, specialType, name, mobile, idCard);
         l.forEach(i -> {
             IcResiUserDTO resi = icResiUserDao.getResiUserByIdCard(i.getIdCard(), customerId);

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"/>

epmet-user/epmet-user-server/src/main/resources/mapper/IcSpecialDao.xml

@@ -18,19 +18,25 @@
              , s.SPECIAL_RQLB SPECIAL_TYPES_STR
         from ic_resi_user r
                  inner join ic_special s on (r.ID = s.IC_RESI_USER and s.DEL_FLAG = 0)
-        where r.DEL_FLAG = 0
+        where
+            r.DEL_FLAG = 0
+            and (r.PIDS like CONCAT(#{orgIdPath}, '%')
+                <if test="orgType == 'agency'">
+                    or r.AGENCY_ID = #{orgId}
+                </if>
+                <if test="orgType == 'grid'">
+                    or r.GRID_ID = #{orgId}
+                </if>
+            )
             <if test="name != null and name != ''">
                 and r.NAME like CONCAT('%', #{name}, '%')
             </if>
             <if test="specialType != null and specialType != ''">
-                and s.SPECIAL_RQLB like #{specialType}
+                and s.SPECIAL_RQLB like CONCAT('%', #{specialType}, '%')
             </if>
             <if test="idCard != null and idCard != ''">
                 and r.ID_CARD like CONCAT('%', #{idCard}, '%')
             </if>
-            <if test="orgIdPath != null and orgIdPath != ''">
-                and r.PIDS like CONCAT(#{orgIdPath}, '%') or r.AGENCY_ID = #{agencyId}
-            </if>
             <if test="mobile != null and mobile != ''">
                 and r.MOBILE like CONCAT('%', #{mobile}, '%')
             </if>