From 607141cf62d77668a56c81794ebffe6cfc6cf8aa Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Sat, 3 Aug 2019 18:23:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83=E6=89=8B?=
 =?UTF-8?q?=E6=9C=BA=E7=AB=AF=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css   | 6 ++++++
 .../resources/templates/system/user/profile/profile.html    | 4 ++--
 .../java/com/ruoyi/framework/aspectj/DataScopeAspect.java   | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css b/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css
index c87a98d9..291af5fa 100644
--- a/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css
@@ -294,6 +294,12 @@
 	margin: 5px 0 5px -25px
 }
 
+@media ( min-width : 768px) {
+	.section-content .about {
+		padding-left: 0px
+	}
+}
+
 /** select2 样式修改 **/
 .select2-container--default .select2-selection--multiple .select2-selection__choice {
 	background-color: #1AB394;
diff --git a/ruoyi-admin/src/main/resources/templates/system/user/profile/profile.html b/ruoyi-admin/src/main/resources/templates/system/user/profile/profile.html
index b83dab3e..4accf3b5 100644
--- a/ruoyi-admin/src/main/resources/templates/system/user/profile/profile.html
+++ b/ruoyi-admin/src/main/resources/templates/system/user/profile/profile.html
@@ -8,7 +8,7 @@
     <input id="userId" name="userId" type="hidden" th:value="${user.userId}" />
     <section class="section-content">
     <div class="row">
-        <div class="col-xs-3 pr5">
+        <div class="col-sm-3 pr5">
             <div class="ibox float-e-margins">
                 <div class="ibox-title ibox-title-gray dashboard-header gray-bg">
                     <h5>个人资料</h5>
@@ -44,7 +44,7 @@
             </div>
         </div>
         
-        <div class="col-xs-9" style="padding-left: 0px">
+        <div class="col-sm-9 about">
             <div class="ibox float-e-margins">
                 <div class="ibox-title ibox-title-gray dashboard-header">
                     <h5>基本资料</h5>
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
index edf9a184..9fa9b0af 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
@@ -120,7 +120,7 @@ public class DataScopeAspect
             {
                 sqlString.append(StringUtils.format(
                         " OR {}.dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) )",
-                        deptAlias, user.getDeptId(),  user.getDeptId()));
+                        deptAlias, user.getDeptId(), user.getDeptId()));
             }
             else if (DATA_SCOPE_SELF.equals(dataScope))
             {