bug fix
This commit is contained in:
zhuangqian
parent
a20c9da0bb
commit
9424576021
|
|
@ -10,7 +10,7 @@ Target Server Type : MYSQL
|
|||
Target Server Version : 50528
|
||||
File Encoding : 65001
|
||||
|
||||
Date: 2016-11-19 10:47:25
|
||||
Date: 2016-12-01 12:20:20
|
||||
*/
|
||||
|
||||
SET FOREIGN_KEY_CHECKS=0;
|
||||
|
|
@ -122,7 +122,7 @@ AUTO_INCREMENT=46
|
|||
-- Records of tfw_dict
|
||||
-- ----------------------------
|
||||
BEGIN;
|
||||
INSERT INTO `tfw_dict` VALUES ('1', '101', '0', '0', '性别', null, '0'), ('2', '101', '1', '1', '男', null, '1'), ('3', '101', '2', '1', '女', null, '5'), ('5', '901', '0', '0', '账号状态', null, '0'), ('6', '901', '1', '5', '启用', null, '0'), ('7', '901', '2', '5', '冻结', null, '0'), ('8', '901', '5', '5', '待审核', null, '1'), ('9', '901', '4', '5', '审核拒绝', null, '0'), ('10', '901', '3', '5', '已删除', null, '1'), ('11', '902', '0', '0', '状态', null, '0'), ('12', '902', '1', '11', '启用', null, '0'), ('13', '902', '2', '11', '禁用', null, '0'), ('14', '102', '0', '0', '公告类型', null, '0'), ('15', '102', '10', '14', '通知公告', null, '0'), ('16', '102', '9', '14', '发布计划', null, '0'), ('17', '903', '0', '0', '审核状态', null, '0'), ('18', '903', '1', '17', '待审核', null, '0'), ('19', '903', '2', '17', '审核拒绝', null, '0'), ('20', '903', '3', '17', '审核通过', null, '0'), ('41', '102', '6', '16', '测试', null, '0'), ('44', '102', '1', '14', '发布测试', null, '0'), ('45', '102', '2', '16', '测试222', null, '2');
|
||||
INSERT INTO `tfw_dict` VALUES ('1', '101', '0', '0', '性别', null, '0'), ('2', '101', '1', '1', '男', null, '1'), ('3', '101', '2', '1', '女', null, '5'), ('5', '901', '0', '0', '账号状态', null, '0'), ('6', '901', '1', '5', '启用', null, '0'), ('7', '901', '2', '5', '冻结', null, '0'), ('8', '901', '3', '5', '待审核', null, '2'), ('9', '901', '4', '5', '审核拒绝', null, '0'), ('10', '901', '5', '5', '已删除', null, '3'), ('11', '902', '0', '0', '状态', null, '0'), ('12', '902', '1', '11', '启用', null, '0'), ('13', '902', '2', '11', '禁用', null, '0'), ('14', '102', '0', '0', '公告类型', null, '0'), ('15', '102', '10', '14', '通知公告', null, '0'), ('16', '102', '9', '14', '发布计划', null, '0'), ('17', '903', '0', '0', '审核状态', null, '0'), ('18', '903', '1', '17', '待审核', null, '0'), ('19', '903', '2', '17', '审核拒绝', null, '0'), ('20', '903', '3', '17', '审核通过', null, '0'), ('41', '102', '6', '16', '测试', null, '0'), ('44', '102', '1', '14', '发布测试', null, '0'), ('45', '102', '2', '16', '测试222', null, '2');
|
||||
COMMIT;
|
||||
|
||||
-- ----------------------------
|
||||
|
|
@ -371,7 +371,7 @@ PRIMARY KEY (`ID`)
|
|||
)
|
||||
ENGINE=InnoDB
|
||||
DEFAULT CHARACTER SET=utf8 COLLATE=utf8_general_ci
|
||||
AUTO_INCREMENT=23
|
||||
AUTO_INCREMENT=24
|
||||
|
||||
;
|
||||
|
||||
|
|
@ -545,4 +545,4 @@ ALTER TABLE `tfw_role_ext` AUTO_INCREMENT=128;
|
|||
-- ----------------------------
|
||||
-- Auto increment value for tfw_user
|
||||
-- ----------------------------
|
||||
ALTER TABLE `tfw_user` AUTO_INCREMENT=23;
|
||||
ALTER TABLE `tfw_user` AUTO_INCREMENT=24;
|
||||
|
|
|
|||
|
|
@ -317,83 +317,6 @@ INSERT INTO "TFW_MENU" VALUES ('88', 'llog_add', 'llog', '新增', 'btn btn-xs b
|
|||
INSERT INTO "TFW_MENU" VALUES ('89', 'llog_edit', 'llog', '修改', 'btn btn-xs btn-white | fa fa-pencil bigger-120', '/llog/edit', '2', '4', null, 'llog_edit.html', null, '1', '0', '0', '0', 'edit');
|
||||
INSERT INTO "TFW_MENU" VALUES ('90', 'llog_remove', 'llog', '删除', 'btn btn-xs btn-white | fa fa-times bigger-120', '/llog/remove', '3', '4', null, null, null, '1', '0', '0', '0', 'remove');
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for TFW_METADATA
|
||||
-- ----------------------------
|
||||
DROP TABLE "TFW_METADATA";
|
||||
CREATE TABLE "TFW_METADATA" (
|
||||
"ID" NUMBER NOT NULL ,
|
||||
"CODE" NVARCHAR2(2000) NULL ,
|
||||
"SEQ" NVARCHAR2(2000) NULL ,
|
||||
"KEYSJSON" NVARCHAR2(2000) NULL ,
|
||||
"COLNAMES" NVARCHAR2(2000) NULL ,
|
||||
"COLMODEL" NVARCHAR2(2000) NULL ,
|
||||
"SEARCHJSON" NVARCHAR2(2000) NULL ,
|
||||
"ADDJSON" NVARCHAR2(2000) NULL ,
|
||||
"EDITJSON" NVARCHAR2(2000) NULL ,
|
||||
"VIEWJSON" NVARCHAR2(2000) NULL ,
|
||||
"SORTSTR" NVARCHAR2(2000) NULL ,
|
||||
"ORDERSTR" NVARCHAR2(2000) NULL ,
|
||||
"STATUS" NUMBER NULL ,
|
||||
"ISFIT" NUMBER NULL ,
|
||||
"LISTMETHOD" NVARCHAR2(2000) NULL ,
|
||||
"SAVEMETHOD" NVARCHAR2(2000) NULL ,
|
||||
"UPDATEMETHOD" NVARCHAR2(2000) NULL ,
|
||||
"FILTERSTR" NVARCHAR2(2000) NULL ,
|
||||
"CREATETIME" DATE NULL ,
|
||||
"CREATER" VARCHAR2(255 BYTE) NULL ,
|
||||
"EDITTIME" DATE NULL ,
|
||||
"EDITER" VARCHAR2(255 BYTE) NULL ,
|
||||
"VERSION" NUMBER(11) NULL
|
||||
)
|
||||
LOGGING
|
||||
NOCOMPRESS
|
||||
NOCACHE
|
||||
|
||||
;
|
||||
|
||||
-- ----------------------------
|
||||
-- Records of TFW_METADATA
|
||||
-- ----------------------------
|
||||
INSERT INTO "TFW_METADATA" VALUES ('21', 'report', null, '[{table:"TB_TMSP_GZBG",key:"F_IT_XL",seq:"SEQ_REPORT.nextval"}, {table:"TB_TMSP_GZBGNR",key:"F_IT_XL",foreignKey:"F_IT_BGXL",foreignPrimaryKey:"TB_TMSP_GZBG.F_IT_XL",seq:"SEQ_REPORTCONTENT.nextval"}]', '["序列","报告标题", "报告部门","报告时间","创建时间","创建人","修改时间","修改人"]', '[{name:"F_IT_XL",index:"F_IT_XL", width:35,hidden:true},
|
||||
{name:"F_VC_BT",index:"F_VC_BT", width:100},
|
||||
{name:"DIC_F_IT_BGBM",index:"F_IT_BGBM", width:80},
|
||||
{name:"F_DT_BGSJ",index:"F_DT_BGSJ", width:80},
|
||||
{name:"F_DT_CJSJ",index:"F_DT_CJSJ", width:80},
|
||||
{name:"DIC_F_IT_CJR",index:"F_IT_CJR", width:80},
|
||||
{name:"F_DT_XGSJ",index:"F_DT_XGSJ", width:80},
|
||||
{name:"DIC_F_IT_XGR",index:"F_IT_XGR", width:80}]', '[{name:"报告标题",index:"F_VC_BT", type:"text"},
|
||||
{name:"报告部门",index:"F_IT_BGBM",type:"selectDept"},
|
||||
{name:"报告时间",index:"F_DT_BGSJ", type:"text"} ]', '[{table:"TB_TMSP_GZBG",name:"报告标题",index:"F_VC_BT",type:"text",newline:true,length:8,required:"required"},
|
||||
{table:"TB_TMSP_GZBG",name:"报告部门",index:"F_IT_BGBM", type:"selectDept",newline:true,length:3,required:"required"},
|
||||
{table:"TB_TMSP_GZBG",name:"报告时间",index:"F_DT_BGSJ", type:"laydate",format:"YYYY-MM-DD hh:mm:ss",newline:false,length:3,required:"required"},
|
||||
{table:"TB_TMSP_GZBGNR",name:"报告内容",index:"F_TX_BGNR", type:"kindeditor",newline:true,length:8,required:"required"},
|
||||
{table:"TB_TMSP_GZBG",name:"创建人",index:"F_IT_CJR", type:"hidden",newline:true,value:session.user.ID,length:8},
|
||||
{table:"TB_TMSP_GZBG",name:"创建时间",index:"F_DT_CJSJ", type:"hidden",newline:true,value:c.newdate(),length:8} ]', '[ {table:"TB_TMSP_GZBG",name:"报告标题",index:"F_VC_BT",type:"text",newline:true,length:8,required:"required"},
|
||||
{table:"TB_TMSP_GZBG",name:"报告部门",index:"F_IT_BGBM", type:"selectDept",newline:true,length:3,required:"required"},
|
||||
{table:"TB_TMSP_GZBG",name:"报告时间",index:"F_DT_BGSJ", type:"laydate",format:"YYYY-MM-DD hh:mm:ss",newline:false,length:3,required:"required"},
|
||||
{table:"TB_TMSP_GZBGNR",name:"报告内容",index:"F_TX_BGNR", type:"kindeditor",newline:true,length:8,required:"required"},
|
||||
{table:"TB_TMSP_GZBG",name:"修改人",index:"F_IT_XGR", type:"autohidden",newline:true,value:session.user.ID,length:8},
|
||||
{table:"TB_TMSP_GZBG",name:"修改时间",index:"F_DT_XGSJ", type:"autohidden",newline:true,value:c.newdate(),length:8}]', '[ {table:"TB_TMSP_GZBG",name:"报告标题",index:"F_VC_BT",type:"text",newline:true,length:8,required:"required"},
|
||||
{table:"TB_TMSP_GZBG",name:"报告部门",index:"DIC_F_IT_BGBM", type:"selectDept",newline:true,length:3,required:"required"},
|
||||
{table:"TB_TMSP_GZBG",name:"报告时间",index:"F_DT_BGSJ", type:"laydate",newline:false,length:3,required:"required"},
|
||||
{table:"TB_TMSP_GZBGNR",name:"报告内容",index:"F_TX_BGNR", type:"kindeditor",newline:true,length:8,required:"required"}]', 'f_it_xl', 'desc', '1', '0', '/template/list', '/template/save', '/template/update', null, TO_DATE('2015-11-02 14:25:29', 'YYYY-MM-DD HH24:MI:SS'), '1', TO_DATE('2015-11-02 14:25:29', 'YYYY-MM-DD HH24:MI:SS'), '1', '2');
|
||||
INSERT INTO "TFW_METADATA" VALUES ('1', 'notice', null, '[{table:"TB_TMSP_TZGG",key:"F_IT_XL",seq:"SEQ_NOTICE.nextval"}]', '[ "序列","通知标题", "公告类型","发布时间"]', '[{name:"F_IT_XL",index:"F_IT_XL", width:35,hidden:true},
|
||||
{name:"F_VC_BT",index:"F_VC_BT", width:100},
|
||||
{name:"DIC_F_IT_LX",index:"DIC_F_IT_LX", width:80},
|
||||
{name:"F_DT_FBSJ",index:"F_DT_FBSJ", width:80}]', '[{name:"通知标题",index:"F_VC_BT", type:"text"},
|
||||
{name:"公告类型",index:"F_IT_LX",type:"select_102"},
|
||||
{name:"发布时间",index:"F_DT_FBSJ", type:"text"}]', '[ {table:"TB_TMSP_TZGG",name:"通知标题",index:"F_VC_BT",type:"text",newline:true,length:8,required:"required"},
|
||||
{table:"TB_TMSP_TZGG",name:"公告类型",index:"F_IT_LX", type:"select_102",newline:true,length:3,required:"required"},
|
||||
{table:"TB_TMSP_TZGG",name:"通知时间",index:"F_DT_FBSJ", type:"laydate",format:"YYYY-MM-DD hh:mm:ss",newline:false,length:3},
|
||||
{table:"TB_TMSP_TZGG",name:"通知内容",index:"F_TX_NR", type:"kindeditor",newline:true,length:8,required:"required"} ]', '[{table:"TB_TMSP_TZGG",name:"通知标题",index:"F_VC_BT",type:"text",newline:true,length:8,required:"required"},
|
||||
{table:"TB_TMSP_TZGG",name:"公告类型",index:"F_IT_LX", type:"combo_102",newline:true,length:3,required:"required"},
|
||||
{table:"TB_TMSP_TZGG",name:"通知时间",index:"F_DT_FBSJ", type:"laydate",format:"YYYY-MM-DD hh:mm:ss",newline:false,length:3},
|
||||
{table:"TB_TMSP_TZGG",name:"通知内容",index:"F_TX_NR", type:"kindeditor",newline:true,length:8,required:"required"}]', '[{table:"TB_TMSP_TZGG",name:"通知标题",index:"F_VC_BT",type:"text",newline:true,length:8,required:"required"},
|
||||
{table:"TB_TMSP_TZGG",name:"公告类型",index:"DIC_F_IT_LX", type:"select_102",newline:true,length:3,required:"required"},
|
||||
{table:"TB_TMSP_TZGG",name:"通知时间",index:"F_DT_FBSJ", type:"date",newline:false,length:3,required:"required"},
|
||||
{table:"TB_TMSP_TZGG",name:"通知内容",index:"F_TX_NR", type:"kindeditor",newline:true,length:8,required:"required"}]', 'f_it_xl', 'desc', '1', '1', '/template/list', '/template/save', '/template/update', '{"f_it_cjr":"session.user.ID"}', TO_DATE('2015-11-02 14:25:29', 'YYYY-MM-DD HH24:MI:SS'), '1', TO_DATE('2015-11-02 14:25:29', 'YYYY-MM-DD HH24:MI:SS'), '1', '0');
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for TFW_OPERATION_LOG
|
||||
-- ----------------------------
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ public class BeanInjector {
|
|||
if (value.length > 1) {
|
||||
o = CollectionKit.join(value, ",");
|
||||
} else {
|
||||
o = Func.equals(value[0], "") ? " " : value[0];
|
||||
o = value[0];
|
||||
}
|
||||
}
|
||||
map.put(StrKit.removePrefixIgnoreCase(param.getKey(), start).toLowerCase(), o);
|
||||
|
|
@ -85,7 +85,7 @@ public class BeanInjector {
|
|||
if (value.length > 1) {
|
||||
o = CollectionKit.join(value, ",");
|
||||
} else {
|
||||
o = Func.equals(value[0], "") ? " " : value[0];
|
||||
o = value[0];
|
||||
}
|
||||
}
|
||||
map.put(param.getKey(), o);
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ public class Convert {
|
|||
|
||||
if (Date.class.isAssignableFrom(clazz)) {
|
||||
// 判断标准日期
|
||||
// ----2016-11-24---zhuangqian----需要加toDate(),不然beetlsql转换date类型的时候会报错-
|
||||
// ----2016-11-24---zhuangqian----需要加toDate(),不然beetlsql转换date类型的时候会报错----
|
||||
return DateTimeKit.parse(valueStr).toDate();
|
||||
} else if (clazz == BigInteger.class) {
|
||||
// 数学计算数字
|
||||
|
|
@ -78,7 +78,11 @@ public class Convert {
|
|||
}
|
||||
|
||||
if (clazz.isAssignableFrom(String.class)) {
|
||||
return valueStr;
|
||||
// ----2016-12-01---zhuangqian----防止beetlsql对空字符串不检测导致无法入库的问题----
|
||||
if (StrKit.isBlank(valueStr.trim()))
|
||||
return " ";
|
||||
else
|
||||
return valueStr;
|
||||
}
|
||||
|
||||
BasicType basicType = null;
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user