未选中二级部门报错

whepi-web/src/main/java/com/bofeng/dao/UserOpenMapper.java

@@ -28,8 +28,12 @@ public interface UserOpenMapper extends BaseMapper<UserOpen> {
 //    @Select(
 //            "select user_id as userId, open_id as openId, nick_name as nickName from sys_user_open limit #{start}, #{count}"
 //    )
-    @Select("select user_id as userId, open_id as openId, nick_name as nickName from sys_user_open where user_id not in ( select user_id from ( select user_id from sys_user_open suo \n" +
-            "inner join ms_report mr on mr.user_create=suo.user_id and mr.report_status=1 and mr.report_date=curdate()) h)" +
+    @Select("SELECT o.user_id AS userId,o.open_id AS openId,o.nick_name AS nickName  " +
+            "FROM sys_user_open o " +
+            "left join sys_user_role r on r.user_id = o.user_id " +
+            "left join sys_uptown_house h on h.house_id = r.property_id " +
+            "left join sys_uptown_unit u on u.unit_id = h.unit_id " +
+            "WHERE u.uptown_id = 1238790987234 " +
             "limit #{start}, #{count}"
     )
     List<UserOpen> getOpenUser(@Param("start") Long start, @Param("count") Long count);

whepi-web/src/main/java/com/bofeng/service/EpiTemplateMessageService.java

@@ -95,7 +95,7 @@ public class EpiTemplateMessageService {
         List<UptownHome> uptownHomeList = uptownHomeMapper.getUptownHomeByUserId(userId);
         if (uptownHomeList != null && uptownHomeList.size()>0) {
             map.put("first", "");
-            map.put("keyword1", "尊敬的 "+uptownHomeList.get(0).getLinkman()+" 先生/女士，");
+            map.put("keyword1", "尊敬的 "+uptownHomeList.get(0).getLinkman()+" 先生/女士");
             SimpleDateFormat sdf1 =new SimpleDateFormat("yyyy-MM-dd" );
             Date d1= new Date();
             String str1 = sdf1.format(d1);

whepi-web/src/main/resources/application-prod.yml

@@ -6,16 +6,16 @@ logging:
     console: '%d %-5level %logger{32} - %msg%n'
 
 debug: false
-#ui-path: file:/home/www/ws/wuhan_epi/whepi-ui
-ui-path: file:/home/oilschedule/ws/wuhan_epi/whepi-ui
+ui-path: file:/home/www/ws/wuhan_epi/whepi-ui
+#ui-path: file:/home/oilschedule/ws/wuhan_epi/whepi-ui
 secret: hh123 # jwt私钥
 salt: 456 #密码加盐
 token_time_minutes: 720 #12小时有效期
 token_time_minutes_mobile: 525600 #1年有效
 
 server:
-#  port: 8086
-  port: 8888
+  port: 8086
+#  port: 8888
 
 yvan:
   debug: false
@@ -24,12 +24,12 @@ yvan:
   upload_domain: /static
   wechat:
     token: wuhanepi
-    #appID: wx0b7d70ff931c397d
-    #appsecret: 7f6af95b5f6ad1f9d45fc57c1b58f7cf
+    appID: wx0b7d70ff931c397d
+    appsecret: 7f6af95b5f6ad1f9d45fc57c1b58f7cf
     EncodingAESKey: Wpm1KEBmXvVLjeOyqWbn6PJlkW7tlR7MxXmrm4i9zcg
 
-    appID: wx6108f00b10079000
-    appsecret: 96a98a8fb01b170a339e44f00a6a25f4
+#    appID: wx6108f00b10079000
+#    appsecret: 96a98a8fb01b170a339e44f00a6a25f4
 
 #    appID: wx91b94bb5e8334dcd
 #    appsecret: 3b52b8deb374c022437abb03fe13ce4a
@@ -49,8 +49,8 @@ yvan:
     #qrcode_match_cust_expire_second: 10800
 
     #bofeng9999 / 789456hh
-#    domain: http://caller.whyxzz.com.cn
-    domain: http://jy.lingyun.com
+    domain: http://caller.whyxzz.com.cn
+#    domain: http://jy.lingyun.com
     tmpTicketExpireSeconds: 10800
     templates:
       预定信息: 'MLNz8YVi7zofQOBeLS0Ruhr-3fJpTnfsKjyPeDB879s'
@@ -58,7 +58,9 @@ yvan:
       结账信息: '5t4LSW4cb7j4mcHxoYyzTvLHnp2gehpxn1faf7G4ABs'
       结算信息: 'GoZBKvyqAfP8uM3xrJk40YHhMoM_E44aPLEoKV_1-pQ'
       每日提醒: 'yJDr5rSc9q9OkX-wuchH4N_msKcnA1zXgjEA3XXxKbs'
-      系统提醒: 'PQfBWS9Wi07LVuBaZeLxAn_Os05XY1fzXbR6x-88LkI'
+#      系统提醒: 'PQfBWS9Wi07LVuBaZeLxAn_Os05XY1fzXbR6x-88LkI'
+
+      系统提醒: '62x92fgWSbn6OoHVC2MwOkzzzss56AXHYVn_tQW1d6c'
 
       #  备用模板：新任务提醒  1Fj70-L2-CQNAk4ESmGCIwoi753LrYRT9RxaNDMLCtU
 
@@ -71,14 +73,14 @@ spring:
     driverClassName: net.sf.log4jdbc.DriverSpy
 
 
-#    url: jdbc:log4jdbc:mysql://localhost:3306/whepi?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
+    url: jdbc:log4jdbc:mysql://localhost:3306/whepi?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
 
-#    username: whepi
-#    password: hust!2020epi
+    username: whepi
+    password: hust!2020epi
 
-    url: jdbc:log4jdbc:mysql://rm-8vbjns8g515bo16crvo.mysql.zhangbei.rds.aliyuncs.com:3306/wuhan_epi?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
-    username: vmes
-    password: agrvqL$D
+#    url: jdbc:log4jdbc:mysql://rm-8vbjns8g515bo16crvo.mysql.zhangbei.rds.aliyuncs.com:3306/wuhan_epi?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
+#    username: vmes
+#    password: agrvqL$D
 
   redis:
     database: 8