Commit c83b07fe authored by 李家智's avatar 李家智
Browse files

fix

parent b57a3992
...@@ -10,19 +10,11 @@ import java.util.Date; ...@@ -10,19 +10,11 @@ import java.util.Date;
public class CmsBlogQuery extends PageParam { public class CmsBlogQuery extends PageParam {
@Query(name = "id", display = true) @Query(name = "id", display = true)
private Integer id; private Integer id;
@Query(name = "title", display = true)
private String title;
public Integer getId(){ public Integer getId(){
return id; return id;
} }
public void setId(Integer id ){ public void setId(Integer id ){
this.id = id; this.id = id;
} }
public String getTitle(){
return title;
}
public void setTitle(String title ){
this.title = title;
}
} }
...@@ -10,12 +10,6 @@ queryByCondition ...@@ -10,12 +10,6 @@ queryByCondition
where 1=1 where 1=1
@//数据权限,该sql语句功能点 @//数据权限,该sql语句功能点
and #function("cmsBlog.query")# and #function("cmsBlog.query")#
@if(!isEmpty(id)){
and t.id =#id#
@}
@if(!isEmpty(title)){
and t.title =#title#
@}
......
...@@ -77,4 +77,21 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { ...@@ -77,4 +77,21 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
return ; return ;
} }
var url = "/admin/cmsBlog/edit.do?id="+data.id; var url = "/admin/cmsBlog/edit.do?id="+data.id;
Common.openDlg(url,"CmsBlog管理>"+data. Common.openDlg(url,"CmsBlog管理>"+data.title+">编辑");
\ No newline at end of file },
del : function() {
layui.use(['del'], function(){
var delView = layui.del
delView.delBatch();
});
}
};
$('.ext-toolbar').on('click', function() {
var type = $(this).data('type');
toolbar[type] ? toolbar[type].call(this) : '';
});
}
}
exports('index',view);
});
\ No newline at end of file
...@@ -73,21 +73,10 @@ public class CoreCodeGenController { ...@@ -73,21 +73,10 @@ public class CoreCodeGenController {
@PostMapping(MODEL + "/gen.json") @PostMapping(MODEL + "/gen.json")
@ResponseBody @ResponseBody
public JsonResult gen(EntityInfo data) { public JsonResult gen(EntityInfo data) {
Entity info = data.getEntity(); Entity entity = getEntitiyInfo(data);;
String urlBase = data.getUrlBase(); String urlBase = data.getUrlBase();
String basePackage = data.getBasePackage(); String basePackage = data.getBasePackage();
Entity entity = codeGenService.getEntityInfo(info.getTableName());
entity.setCode(info.getCode());
entity.setDisplayName(info.getDisplayName());
entity.setSystem(info.getSystem());
for (int i = 0; i < entity.getList().size(); i++) {
entity.getList().get(i).setDisplayName(info.getList().get(i).getDisplayName());
entity.getList().get(i).setShowInQuery(info.getList().get(i).isShowInQuery());
}
if (StringUtils.isEmpty(entity.getCode()) || StringUtils.isEmpty(entity.getSystem())) {
return JsonResult.failMessage("code,system不能为空");
}
MavenProjectTarget target = new MavenProjectTarget(entity, basePackage); MavenProjectTarget target = new MavenProjectTarget(entity, basePackage);
target.setUrlBase(urlBase); target.setUrlBase(urlBase);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment