From 88d0d068b1c7c88829eed657af9e231789c50ed8 Mon Sep 17 00:00:00 2001
From: Heeexy <hexiaoyu_job@163.com>
Date: Wed, 20 Dec 2017 23:55:16 +0800
Subject: [PATCH] delete_status

---
 back/src/main/resources/mapper/ArticleMapper.xml | 2 +-
 back/src/main/resources/mapper/UserMapper.xml    | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/back/src/main/resources/mapper/ArticleMapper.xml b/back/src/main/resources/mapper/ArticleMapper.xml
index 45465a7..8bd7730 100644
--- a/back/src/main/resources/mapper/ArticleMapper.xml
+++ b/back/src/main/resources/mapper/ArticleMapper.xml
@@ -19,7 +19,7 @@
         SELECT
         w.id id,
         w.content content,
-          date_format(w.create_time, '%Y-%m-%d') createTime
+          date_format(w.create_time, '%Y.%m.%d %T') createTime
         FROM article w
         WHERE w.delete_status = '1'
               ORDER BY w.id DESC
diff --git a/back/src/main/resources/mapper/UserMapper.xml b/back/src/main/resources/mapper/UserMapper.xml
index 9f598b9..c8132c3 100644
--- a/back/src/main/resources/mapper/UserMapper.xml
+++ b/back/src/main/resources/mapper/UserMapper.xml
@@ -54,6 +54,7 @@
             id        roleId,
             role_name roleName
         FROM sys_role
+        WHERE delete_status='1'
     </select>
 
     <insert id="addUser" useGeneratedKeys="true" keyProperty="userId">
@@ -138,7 +139,6 @@
         </foreach>
     </insert>
 
-
     <resultMap id="aRole" type="com.heeexy.example.util.model.One2Many">
         <id column="roleId" property="roleId"/>
         <result column="roleName" property="roleName"/>
@@ -162,7 +162,6 @@
         WHERE r.id = #{roleId}
     </select>
 
-
     <update id="removeRole">
         UPDATE sys_role
         SET