From 39fd893c2d4cf695284826655c3f59bd769cfedd Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期一, 04 一月 2021 19:45:05 +0800
Subject: [PATCH] 广告通知接口

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
index f2d8695..924a0f7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
@@ -4,9 +4,11 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.model.dtos.PageDTO;
 import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO;
 import com.panzhihua.common.model.vos.LoginUserInfoVO;
 import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
+import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
 import com.panzhihua.common.model.vos.user.SysUserVO;
 import com.panzhihua.service_user.model.dos.SysUserDO;
 import org.apache.ibatis.annotations.Mapper;
@@ -42,8 +44,7 @@
             "u.phone,\n" +
             "u.id_card,\n" +
             "u.face_state,\n" +
-            "c.NAME,\n" +
-            "is_tanant,\n" +
+            "c.name,\n" +
             "u.create_at \n" +
             "FROM\n" +
             "sys_user u\n" +
@@ -71,8 +72,7 @@
             "u.phone,\n" +
             "u.id_card,\n" +
             "u.job,\n" +
-            "c.NAME,\n" +
-            "u.is_tanant,\n" +
+            "c.name,\n" +
             "u.tags,\n" +
             "u.create_at \n" +
             "FROM\n" +
@@ -138,7 +138,8 @@
             "u.last_login_time\n" +
             "from sys_user u\n" +
             "left join com_act a on u.community_id=a.community_id\n" +
-            " <where>" +
+            " where\n" +
+            "u.type=1\n"+
             "<if test='pageUserAppletsBackstageDTO.phone != null and pageUserAppletsBackstageDTO.phone.trim() != &quot;&quot;'>" +
             "and u.phone=#{pageUserAppletsBackstageDTO.phone}\n" +
             " </if> " +
@@ -154,10 +155,11 @@
             "<if test='pageUserAppletsBackstageDTO.lastLoginTimeBegin != null '>" +
             "and u.last_login_time between #{pageUserAppletsBackstageDTO.lastLoginTimeBegin} and #{pageUserAppletsBackstageDTO.lastLoginTimeEnd}\n" +
             " </if> " +
-            " </where>" +
             "order by u.create_at desc \n" +
             "</script>")
     IPage<SysUserVO> pageUserAppletsBackstage(Page page, @Param("pageUserAppletsBackstageDTO") PageUserAppletsBackstageDTO pageUserAppletsBackstageDTO);
     @Update("update sys_user set nick_name=null ,community_id=null,area_id=null where user_id=#{userId}")
     int deleteUserTest(Long userId);
+    @Select("select * from sys_user_notice where user_id=#{pageDTO.userId} order by create_at desc ")
+    IPage<SysUserNoticeVO> pageNotice(Page page, @Param("pageDTO") PageDTO pageDTO);
 }

--
Gitblit v1.7.1