浏览代码

未选中二级部门报错

caotao 5 年之前
父节点
当前提交
cf56e1197e

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

@@ -28,12 +28,8 @@ 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 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 " +
+    @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)" +
             "limit #{start}, #{count}"
     )
     List<UserOpen> getOpenUser(@Param("start") Long start, @Param("count") Long count);

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

@@ -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,9 +58,9 @@ yvan:
       结账信息: '5t4LSW4cb7j4mcHxoYyzTvLHnp2gehpxn1faf7G4ABs'
       结算信息: 'GoZBKvyqAfP8uM3xrJk40YHhMoM_E44aPLEoKV_1-pQ'
       每日提醒: 'yJDr5rSc9q9OkX-wuchH4N_msKcnA1zXgjEA3XXxKbs'
-#      系统提醒: 'PQfBWS9Wi07LVuBaZeLxAn_Os05XY1fzXbR6x-88LkI'
+      系统提醒: 'PQfBWS9Wi07LVuBaZeLxAn_Os05XY1fzXbR6x-88LkI'
 
-      系统提醒: '62x92fgWSbn6OoHVC2MwOkzzzss56AXHYVn_tQW1d6c'
+#      系统提醒: '62x92fgWSbn6OoHVC2MwOkzzzss56AXHYVn_tQW1d6c'
 
       #  备用模板:新任务提醒  1Fj70-L2-CQNAk4ESmGCIwoi753LrYRT9RxaNDMLCtU