From 6c47f48e067a9b48c5f917ff5fdc7d22d100648e Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Tue, 9 Jul 2019 18:43:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E9=BB=98=E8=AE=A4=E5=AD=97=E6=AE=B5=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/static/ruoyi/css/ry-ui.css      |  4 ++++
 .../src/main/resources/templates/demo/operate/add.html |  2 +-
 .../main/resources/templates/system/config/add.html    |  2 +-
 .../src/main/resources/templates/system/dept/add.html  |  2 +-
 .../src/main/resources/templates/system/dept/dept.html |  2 +-
 .../main/resources/templates/system/dict/data/add.html |  4 ++--
 .../main/resources/templates/system/dict/type/add.html |  2 +-
 .../src/main/resources/templates/system/menu/add.html  |  2 +-
 .../src/main/resources/templates/system/menu/menu.html |  2 +-
 .../main/resources/templates/system/notice/add.html    |  2 +-
 .../src/main/resources/templates/system/post/add.html  |  2 +-
 .../java/com/ruoyi/common/constant/UserConstants.java  |  6 ++++++
 .../src/main/resources/templates/monitor/job/add.html  |  2 +-
 .../main/java/com/ruoyi/system/domain/SysDictData.java | 10 ++++++++--
 14 files changed, 30 insertions(+), 14 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 d6a9c71cd..17443e275 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
@@ -790,6 +790,10 @@ label {
 	border-top: 0px solid #ddd;
 }
 
+.fixed-table-container {
+	border: 0px solid #ddd;
+}
+
 .table-striped .table>thead>tr>th, .table-striped .table>tbody>tr>th {
 	border-bottom: 1px solid #ccc!important;
 	border-top: 0px!important;
diff --git a/ruoyi-admin/src/main/resources/templates/demo/operate/add.html b/ruoyi-admin/src/main/resources/templates/demo/operate/add.html
index dcee93d5f..3a95e7939 100644
--- a/ruoyi-admin/src/main/resources/templates/demo/operate/add.html
+++ b/ruoyi-admin/src/main/resources/templates/demo/operate/add.html
@@ -44,7 +44,7 @@
 				<label class="col-sm-3 control-label">用户状态：</label>
 				<div class="col-sm-8">
 				    <div class="radio-box" th:each="dict : ${@dict.getType('sys_normal_disable')}">
-						<input type="radio" th:id="${dict.dictCode}" name="status" th:value="${dict.dictValue}" th:checked="${dict.isDefault == 'Y' ? true : false}">
+						<input type="radio" th:id="${dict.dictCode}" name="status" th:value="${dict.dictValue}" th:checked="${dict.default}">
 						<label th:for="${dict.dictCode}" th:text="${dict.dictLabel}"></label>
 					</div>
 				</div>
diff --git a/ruoyi-admin/src/main/resources/templates/system/config/add.html b/ruoyi-admin/src/main/resources/templates/system/config/add.html
index 9ee7fd7ef..68b6dee33 100644
--- a/ruoyi-admin/src/main/resources/templates/system/config/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/config/add.html
@@ -28,7 +28,7 @@
 			<label class="col-sm-3 control-label">系统内置：</label>
 			<div class="col-sm-8">
 			    <div class="radio-box" th:each="dict : ${@dict.getType('sys_yes_no')}">
-					<input type="radio" th:id="${dict.dictCode}" name="configType" th:value="${dict.dictValue}" th:checked="${dict.isDefault == 'Y' ? true : false}">
+					<input type="radio" th:id="${dict.dictCode}" name="configType" th:value="${dict.dictValue}" th:checked="${dict.default}">
 					<label th:for="${dict.dictCode}" th:text="${dict.dictLabel}"></label>
 				</div>
 			</div>
diff --git a/ruoyi-admin/src/main/resources/templates/system/dept/add.html b/ruoyi-admin/src/main/resources/templates/system/dept/add.html
index 47c7b829a..3ce6aae14 100644
--- a/ruoyi-admin/src/main/resources/templates/system/dept/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/dept/add.html
@@ -50,7 +50,7 @@
 				<label class="col-sm-3 control-label">部门状态：</label>
 				<div class="col-sm-8">
 				    <div class="radio-box" th:each="dict : ${@dict.getType('sys_normal_disable')}">
-						<input type="radio" th:id="${dict.dictCode}" name="status" th:value="${dict.dictValue}" th:checked="${dict.isDefault == 'Y' ? true : false}">
+						<input type="radio" th:id="${dict.dictCode}" name="status" th:value="${dict.dictValue}" th:checked="${dict.default}">
 						<label th:for="${dict.dictCode}" th:text="${dict.dictLabel}"></label>
 					</div>
 				</div>
diff --git a/ruoyi-admin/src/main/resources/templates/system/dept/dept.html b/ruoyi-admin/src/main/resources/templates/system/dept/dept.html
index 56c48ef18..6663d1848 100644
--- a/ruoyi-admin/src/main/resources/templates/system/dept/dept.html
+++ b/ruoyi-admin/src/main/resources/templates/system/dept/dept.html
@@ -40,7 +40,7 @@
                 </a>
 	        </div>
        		 <div class="col-sm-12 select-table table-striped">
-	            <table id="bootstrap-tree-table" data-mobile-responsive="true"></table>
+	            <table id="bootstrap-tree-table"></table>
 	        </div>
 	    </div>
 	</div>
diff --git a/ruoyi-admin/src/main/resources/templates/system/dict/data/add.html b/ruoyi-admin/src/main/resources/templates/system/dict/data/add.html
index 4ea880fa8..c780d5db2 100644
--- a/ruoyi-admin/src/main/resources/templates/system/dict/data/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/dict/data/add.html
@@ -55,7 +55,7 @@
 				<label class="col-sm-3 control-label">系统默认：</label>
 				<div class="col-sm-8">
 				    <div class="radio-box" th:each="dict : ${@dict.getType('sys_yes_no')}">
-						<input type="radio" th:id="${dict.dictCode}" name="isDefault" th:value="${dict.dictValue}" th:checked="${dict.isDefault == 'Y' ? true : false}">
+						<input type="radio" th:id="${dict.dictCode}" name="isDefault" th:value="${dict.dictValue}" th:checked="${dict.default}">
 						<label th:for="${dict.dictCode}" th:text="${dict.dictLabel}"></label>
 					</div>
 				</div>
@@ -64,7 +64,7 @@
 				<label class="col-sm-3 control-label">状态：</label>
 				<div class="col-sm-8">
 				    <div class="radio-box" th:each="dict : ${@dict.getType('sys_normal_disable')}">
-						<input type="radio" th:id="${dict.dictCode}" name="status" th:value="${dict.dictValue}" th:checked="${dict.isDefault == 'Y' ? true : false}">
+						<input type="radio" th:id="${dict.dictCode}" name="status" th:value="${dict.dictValue}" th:checked="${dict.default}">
 						<label th:for="${dict.dictCode}" th:text="${dict.dictLabel}"></label>
 					</div>
 				</div>
diff --git a/ruoyi-admin/src/main/resources/templates/system/dict/type/add.html b/ruoyi-admin/src/main/resources/templates/system/dict/type/add.html
index a79b22a3a..31756c56c 100644
--- a/ruoyi-admin/src/main/resources/templates/system/dict/type/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/dict/type/add.html
@@ -22,7 +22,7 @@
 				<label class="col-sm-3 control-label">状态：</label>
 				<div class="col-sm-8">
 				    <div class="radio-box" th:each="dict : ${@dict.getType('sys_normal_disable')}">
-						<input type="radio" th:id="${dict.dictCode}" name="status" th:value="${dict.dictValue}" th:checked="${dict.isDefault == 'Y' ? true : false}">
+						<input type="radio" th:id="${dict.dictCode}" name="status" th:value="${dict.dictValue}" th:checked="${dict.default}">
 						<label th:for="${dict.dictCode}" th:text="${dict.dictLabel}"></label>
 					</div>
 				</div>
diff --git a/ruoyi-admin/src/main/resources/templates/system/menu/add.html b/ruoyi-admin/src/main/resources/templates/system/menu/add.html
index 814a183e0..2fd6b972b 100644
--- a/ruoyi-admin/src/main/resources/templates/system/menu/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/menu/add.html
@@ -73,7 +73,7 @@
 				<label class="col-sm-3 control-label">菜单状态：</label>
 				<div class="col-sm-8">
 				    <div class="radio-box" th:each="dict : ${@dict.getType('sys_show_hide')}">
-						<input type="radio" th:id="${dict.dictCode}" name="visible" th:value="${dict.dictValue}" th:checked="${dict.isDefault == 'Y' ? true : false}">
+						<input type="radio" th:id="${dict.dictCode}" name="visible" th:value="${dict.dictValue}" th:checked="${dict.default}">
 						<label th:for="${dict.dictCode}" th:text="${dict.dictLabel}"></label>
 					</div>
 				</div>
diff --git a/ruoyi-admin/src/main/resources/templates/system/menu/menu.html b/ruoyi-admin/src/main/resources/templates/system/menu/menu.html
index 45d01280a..a5ee47679 100644
--- a/ruoyi-admin/src/main/resources/templates/system/menu/menu.html
+++ b/ruoyi-admin/src/main/resources/templates/system/menu/menu.html
@@ -40,7 +40,7 @@
                 </a>
 	        </div>
        		 <div class="col-sm-12 select-table table-striped">
-	            <table id="bootstrap-tree-table" data-mobile-responsive="true"></table>
+	            <table id="bootstrap-tree-table"></table>
 	        </div>
 	    </div>
 	</div>
diff --git a/ruoyi-admin/src/main/resources/templates/system/notice/add.html b/ruoyi-admin/src/main/resources/templates/system/notice/add.html
index f2e7c5be2..4c1893e3e 100644
--- a/ruoyi-admin/src/main/resources/templates/system/notice/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/notice/add.html
@@ -32,7 +32,7 @@
 				<label class="col-sm-2 control-label">公告状态：</label>
 				<div class="col-sm-10">
 				    <div class="radio-box" th:each="dict : ${@dict.getType('sys_notice_status')}">
-						<input type="radio" th:id="${dict.dictCode}" name="status" th:value="${dict.dictValue}" th:checked="${dict.isDefault == 'Y' ? true : false}">
+						<input type="radio" th:id="${dict.dictCode}" name="status" th:value="${dict.dictValue}" th:checked="${dict.default}">
 						<label th:for="${dict.dictCode}" th:text="${dict.dictLabel}"></label>
 					</div>
 				</div>
diff --git a/ruoyi-admin/src/main/resources/templates/system/post/add.html b/ruoyi-admin/src/main/resources/templates/system/post/add.html
index 001b85439..cd84ada21 100644
--- a/ruoyi-admin/src/main/resources/templates/system/post/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/post/add.html
@@ -28,7 +28,7 @@
 				<label class="col-sm-3 control-label">岗位状态：</label>
 				<div class="col-sm-8">
 				    <div class="radio-box" th:each="dict : ${@dict.getType('sys_normal_disable')}">
-						<input type="radio" th:id="${dict.dictCode}" name="status" th:value="${dict.dictValue}" th:checked="${dict.isDefault == 'Y' ? true : false}">
+						<input type="radio" th:id="${dict.dictCode}" name="status" th:value="${dict.dictValue}" th:checked="${dict.default}">
 						<label th:for="${dict.dictCode}" th:text="${dict.dictLabel}"></label>
 					</div>
 				</div>
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
index 57154e71a..a51ba3bfd 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
@@ -27,6 +27,12 @@ public class UserConstants
     /** 部门正常状态 */
     public static final String DEPT_NORMAL = "0";
 
+    /** 字典正常状态 */
+    public static final String DICT_NORMAL = "0";
+
+    /** 是否为系统默认（是） */
+    public static final String YES = "Y";
+
     /**
      * 用户名长度限制
      */
diff --git a/ruoyi-quartz/src/main/resources/templates/monitor/job/add.html b/ruoyi-quartz/src/main/resources/templates/monitor/job/add.html
index 7333254a9..d404a9754 100644
--- a/ruoyi-quartz/src/main/resources/templates/monitor/job/add.html
+++ b/ruoyi-quartz/src/main/resources/templates/monitor/job/add.html
@@ -56,7 +56,7 @@
 				<label class="col-sm-3 control-label">状态：</label>
 				<div class="col-sm-8">
 				    <div class="radio-box" th:each="dict : ${@dict.getType('sys_job_status')}">
-						<input type="radio" th:id="${dict.dictCode}" name="status" th:value="${dict.dictValue}" th:checked="${dict.isDefault == 'Y' ? true : false}">
+						<input type="radio" th:id="${dict.dictCode}" name="status" th:value="${dict.dictValue}" th:checked="${dict.default}">
 						<label th:for="${dict.dictCode}" th:text="${dict.dictLabel}"></label>
 					</div>
 				</div>
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDictData.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDictData.java
index b35508a4a..c8426db56 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDictData.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDictData.java
@@ -3,6 +3,7 @@ package com.ruoyi.system.domain;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
@@ -119,6 +120,11 @@ public class SysDictData extends BaseEntity
         this.listClass = listClass;
     }
 
+    public boolean getDefault()
+    {
+        return UserConstants.YES.equals(this.isDefault) ? true : false;
+    }
+
     public String getIsDefault()
     {
         return isDefault;
@@ -138,8 +144,8 @@ public class SysDictData extends BaseEntity
     {
         this.status = status;
     }
-    
-	@Override
+
+    @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("dictCode", getDictCode())