From eae8c660cf139f986ff8ea3481046fa512b88a64 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Fri, 18 Jan 2019 16:40:56 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E5=AD=97=E6=AE=B5=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E5=8F=AF=E4=BF=AE=E6=94=B9=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/templates/index.html   |  2 +-
 .../resources/templates/monitor/job/add.html  |  3 +++
 .../resources/templates/monitor/job/edit.html |  3 +++
 .../mapper/system/SysConfigMapper.xml         |  2 +-
 .../resources/mapper/system/SysDeptMapper.xml |  6 ++---
 .../mapper/system/SysDictDataMapper.xml       |  6 ++---
 .../mapper/system/SysDictTypeMapper.xml       |  2 +-
 .../resources/mapper/system/SysMenuMapper.xml |  2 +-
 .../mapper/system/SysNoticeMapper.xml         |  2 +-
 .../resources/mapper/system/SysPostMapper.xml |  2 +-
 .../resources/mapper/system/SysRoleMapper.xml |  2 +-
 sql/ry_20190118.sql                           | 26 +++++++++----------
 12 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/index.html b/ruoyi-admin/src/main/resources/templates/index.html
index 01d5fdd2c..1c58aa725 100644
--- a/ruoyi-admin/src/main/resources/templates/index.html
+++ b/ruoyi-admin/src/main/resources/templates/index.html
@@ -87,7 +87,7 @@
                     </a>
                 </div>
                 <ul class="nav navbar-top-links navbar-right welcome-message">
-                    <li><a title="使用文档" href="http://doc.ruoyi.vip" target="_blank"><i class="fa fa-quora"></i> 使用文档</a></li>
+                    <li><a title="使用文档" href="http://doc.ruoyi.vip" target="_blank"><i class="fa fa-question-circle"></i> 使用文档</a></li>
 	                <li><a title="全屏显示" id="fullScreen"><i class="fa fa-arrows-alt"></i> 全屏显示</a></li>
                     <li class="dropdown user-menu">
 						<a href="javascript:" class="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown">
diff --git a/ruoyi-admin/src/main/resources/templates/monitor/job/add.html b/ruoyi-admin/src/main/resources/templates/monitor/job/add.html
index fb5c285d2..fef818bee 100644
--- a/ruoyi-admin/src/main/resources/templates/monitor/job/add.html
+++ b/ruoyi-admin/src/main/resources/templates/monitor/job/add.html
@@ -72,6 +72,9 @@
 				jobGroup:{
 					required:true,
 				},
+				methodName:{
+					required:true,
+				},
 				cronExpression:{
 					required:true,
 					remote: {
diff --git a/ruoyi-admin/src/main/resources/templates/monitor/job/edit.html b/ruoyi-admin/src/main/resources/templates/monitor/job/edit.html
index 88f73677a..868f5cb69 100644
--- a/ruoyi-admin/src/main/resources/templates/monitor/job/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/monitor/job/edit.html
@@ -73,6 +73,9 @@
 				jobGroup:{
 					required:true,
 				},
+				methodName:{
+					required:true,
+				},
 				cronExpression:{
 					required:true,
 					remote: {
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
index c0228ca7b..4756c1f18 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
@@ -92,7 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="configValue != null and configValue != ''">config_value = #{configValue},</if>
             <if test="configType != null and configType != ''">config_type = #{configType},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
-            <if test="remark != null and remark != ''">remark = #{remark},</if>
+            <if test="remark != null">remark = #{remark},</if>
  			update_time = sysdate()
         </set>
         where config_id = #{configId}
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
index cb986c7db..175609226 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -110,9 +110,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="deptName != null and deptName != ''">dept_name = #{deptName},</if>
  			<if test="ancestors != null and ancestors != ''">ancestors = #{ancestors},</if>
  			<if test="orderNum != null and orderNum != ''">order_num = #{orderNum},</if>
- 			<if test="leader != null and leader != ''">leader = #{leader},</if>
- 			<if test="phone != null and phone != ''">phone = #{phone},</if>
- 			<if test="email != null and email != ''">email = #{email},</if>
+ 			<if test="leader != null">leader = #{leader},</if>
+ 			<if test="phone != null">phone = #{phone},</if>
+ 			<if test="email != null">email = #{email},</if>
  			<if test="status != null and status != ''">status = #{status},</if>
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
  			update_time = sysdate()
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml
index 083efed88..f6614dad8 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml
@@ -77,11 +77,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="dictLabel != null and dictLabel != ''">dict_label = #{dictLabel},</if>
  			<if test="dictValue != null and dictValue != ''">dict_value = #{dictValue},</if>
  			<if test="dictType != null and dictType != ''">dict_type = #{dictType},</if>
- 			<if test="cssClass != null and cssClass != ''">css_class = #{cssClass},</if>
- 			<if test="listClass != null and listClass != ''">list_class = #{listClass},</if>
+ 			<if test="cssClass != null">css_class = #{cssClass},</if>
+ 			<if test="listClass != null">list_class = #{listClass},</if>
  			<if test="isDefault != null and isDefault != ''">is_default = #{isDefault},</if>
  			<if test="status != null">status = #{status},</if>
- 			<if test="remark != null and remark != ''">remark = #{remark},</if>
+ 			<if test="remark != null">remark = #{remark},</if>
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
  			update_time = sysdate()
  		</set>
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
index 4e7bbbd5c..e2f69f92a 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
@@ -72,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="dictName != null and dictName != ''">dict_name = #{dictName},</if>
  			<if test="dictType != null and dictType != ''">dict_type = #{dictType},</if>
  			<if test="status != null">status = #{status},</if>
- 			<if test="remark != null and remark != ''">remark = #{remark},</if>
+ 			<if test="remark != null">remark = #{remark},</if>
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
  			update_time = sysdate()
  		</set>
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
index fd33cfd52..a7bcaf408 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
@@ -107,7 +107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="url != null and url != ''">url = #{url},</if>
  			<if test="menuType != null and menuType != ''">menu_type = #{menuType},</if>
  			<if test="visible != null">visible = #{visible},</if>
- 			<if test="perms !=null and perms != ''">perms = #{perms},</if>
+ 			<if test="perms !=null">perms = #{perms},</if>
  			<if test="icon !=null and icon != ''">icon = #{icon},</if>
  			<if test="remark != null and remark != ''">remark = #{remark},</if>
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml
index 889ab38b0..dfca13c04 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml
@@ -67,7 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <set>
             <if test="noticeTitle != null and noticeTitle != ''">notice_title = #{noticeTitle}, </if>
             <if test="noticeType != null and noticeType != ''">notice_type = #{noticeType}, </if>
-            <if test="noticeContent != null and noticeContent != ''">notice_content = #{noticeContent}, </if>
+            <if test="noticeContent != null">notice_content = #{noticeContent}, </if>
             <if test="status != null and status != ''">status = #{status}, </if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
  			update_time = sysdate()
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
index 4a009846c..8b0c0292c 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
@@ -78,7 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="postName != null and postName != ''">post_name = #{postName},</if>
  			<if test="postSort != null and postSort != ''">post_sort = #{postSort},</if>
  			<if test="status != null and status != ''">status = #{status},</if>
- 			<if test="remark != null and remark != ''">remark = #{remark},</if>
+ 			<if test="remark != null">remark = #{remark},</if>
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
  			update_time = sysdate()
  		</set>
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
index 3d89ae889..8d810c395 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
@@ -97,7 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="roleSort != null and roleSort != ''">role_sort = #{roleSort},</if>
  			<if test="dataScope != null and dataScope != ''">data_scope = #{dataScope},</if>
  			<if test="status != null and status != ''">status = #{status},</if>
- 			<if test="remark != null and remark != ''">remark = #{remark},</if>
+ 			<if test="remark != null">remark = #{remark},</if>
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
  			update_time = sysdate()
  		</set>
diff --git a/sql/ry_20190118.sql b/sql/ry_20190118.sql
index 4dcf5ba4a..49d5541b3 100644
--- a/sql/ry_20190118.sql
+++ b/sql/ry_20190118.sql
@@ -8,9 +8,9 @@ create table sys_dept (
   ancestors 		varchar(50)     default '' 			       comment '祖级列表',
   dept_name 		varchar(30) 	default '' 				   comment '部门名称',
   order_num 		int(4) 			default 0 			       comment '显示顺序',
-  leader            varchar(20)     default ''                 comment '负责人',
-  phone             varchar(11)     default ''                 comment '联系电话',
-  email             varchar(50)     default ''                 comment '邮箱',
+  leader            varchar(20)     default null               comment '负责人',
+  phone             varchar(11)     default null               comment '联系电话',
+  email             varchar(50)     default null               comment '邮箱',
   status 			char(1) 		default '0' 			   comment '部门状态（0正常 1停用）',
   del_flag			char(1) 		default '0' 			   comment '删除标志（0代表存在 2代表删除）',
   create_by         varchar(64)     default ''                 comment '创建者',
@@ -84,7 +84,7 @@ create table sys_post
     create_time   datetime                                   comment '创建时间',
     update_by     varchar(64) 	  default ''			     comment '更新者',
 	update_time   datetime                                   comment '更新时间',
-    remark 		  varchar(500) 	  default '' 				 comment '备注',
+    remark 		  varchar(500) 	  default null 				 comment '备注',
 	primary key (post_id)
 ) engine=innodb default charset=utf8 comment = '岗位信息表';
 
@@ -113,7 +113,7 @@ create table sys_role (
   create_time 		datetime                                   comment '创建时间',
   update_by 		varchar(64) 	default ''			       comment '更新者',
   update_time 		datetime                                   comment '更新时间',
-  remark 			varchar(500) 	default '' 				   comment '备注',
+  remark 			varchar(500) 	default null 			   comment '备注',
   primary key (role_id)
 ) engine=innodb auto_increment=100 default charset=utf8 comment = '角色信息表';
 
@@ -136,7 +136,7 @@ create table sys_menu (
   url 				varchar(200) 	default '#'				   comment '请求地址',
   menu_type 		char(1) 		default '' 			       comment '菜单类型（M目录 C菜单 F按钮）',
   visible 			char(1) 		default 0 				   comment '菜单状态（0显示 1隐藏）',
-  perms 			varchar(100) 	default '' 				   comment '权限标识',
+  perms 			varchar(100) 	default null 			   comment '权限标识',
   icon 				varchar(100) 	default '#' 			   comment '菜单图标',
   create_by         varchar(64)     default ''                 comment '创建者',
   create_time 		datetime                                   comment '创建时间',
@@ -428,7 +428,7 @@ create table sys_dict_type
     create_time      datetime                                   comment '创建时间',
     update_by        varchar(64) 	 default ''			        comment '更新者',
 	update_time      datetime                                   comment '更新时间',
-    remark 	         varchar(500) 	 default '' 				comment '备注',
+    remark 	         varchar(500) 	 default null 				comment '备注',
 	primary key (dict_id),
 	unique (dict_type)
 ) engine=innodb auto_increment=100 default charset=utf8 comment = '字典类型表';
@@ -455,15 +455,15 @@ create table sys_dict_data
 	dict_label       varchar(100)    default ''                 comment '字典标签',
 	dict_value       varchar(100)    default ''                 comment '字典键值',
 	dict_type        varchar(100)    default ''                 comment '字典类型',
-	css_class        varchar(100)    default ''                 comment '样式属性（其他样式扩展）',
-	list_class       varchar(100)    default ''                 comment '表格回显样式',
+	css_class        varchar(100)    default null               comment '样式属性（其他样式扩展）',
+	list_class       varchar(100)    default null               comment '表格回显样式',
 	is_default       char(1)         default 'N'                comment '是否默认（Y是 N否）',
     status 			 char(1) 		 default '0'			    comment '状态（0正常 1停用）',
     create_by        varchar(64)     default ''                 comment '创建者',
     create_time      datetime                                   comment '创建时间',
     update_by        varchar(64) 	 default ''			        comment '更新者',
 	update_time      datetime                                   comment '更新时间',
-    remark 	         varchar(500) 	 default '' 				comment '备注',
+    remark 	         varchar(500) 	 default null 				comment '备注',
 	primary key (dict_code)
 ) engine=innodb auto_increment=100 default charset=utf8 comment = '字典数据表';
 
@@ -510,7 +510,7 @@ create table sys_config (
     create_time 	   datetime                                 comment '创建时间',
     update_by          varchar(64)   default ''                 comment '更新者',
     update_time        datetime                                 comment '更新时间',
-	remark 	           varchar(500)  default '' 				comment '备注',
+	remark 	           varchar(500)  default null 				comment '备注',
 	primary key (config_id)
 ) engine=innodb auto_increment=100 default charset=utf8 comment = '参数配置表';
 
@@ -607,13 +607,13 @@ create table sys_notice (
   notice_id 		int(4) 		    not null auto_increment    comment '公告ID',
   notice_title 		varchar(50) 	not null 				   comment '公告标题',
   notice_type 		char(1) 	    not null 			       comment '公告类型（1通知 2公告）',
-  notice_content    varchar(2000)   default ''                 comment '公告内容',
+  notice_content    varchar(2000)   default null               comment '公告内容',
   status 			char(1) 		default '0' 			   comment '公告状态（0正常 1关闭）',
   create_by         varchar(64)     default ''                 comment '创建者',
   create_time 		datetime                                   comment '创建时间',
   update_by 		varchar(64) 	default ''			       comment '更新者',
   update_time 		datetime                                   comment '更新时间',
-  remark 			varchar(255) 	default '' 				   comment '备注',
+  remark 			varchar(255) 	default null 			   comment '备注',
   primary key (notice_id)
 ) engine=innodb auto_increment=10 default charset=utf8 comment = '通知公告表';