gaoxiong 2 vuotta sitten
vanhempi
commit
f04b8bdb0c

+ 1 - 1
soc-modules/soc-modules-gen/src/main/resources/vm/java/controller.java.vm

@@ -49,7 +49,7 @@ public class ${ClassName}Controller extends BaseController {
 @RequiresPermissions("${permissionPrefix}:list")
 @GetMapping("/list")
     #if($table.crud || $table.sub)
-    public TableDataInfo list(${ClassName} ${className}) {
+    public TableDataInfo<${ClassName}> list(${ClassName} ${className}) {
 
         return ${className}Service.selectPage( ${className});
     }

+ 1 - 19
soc-modules/soc-modules-gen/src/main/resources/vm/java/serviceImpl.java.vm

@@ -40,25 +40,7 @@ public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${C
     private ISysOrgService orgService;
 
     @Override
-    public TableDataInfo selectPage(${ClassName} ${className}) {
-
-
-##        Page<${ClassName}> page;
-##        if (${className}.getPageNum() != null &&${className}.getPageSize() != null){
-##            page = new Page<>(${className}.getPageNum(), ${className}.getPageSize());
-##        }else{
-##            page = new Page<>();
-##        }
-##        QueryWrapper<${ClassName}> where = new QueryWrapper<>(${className});
-##        Page<${ClassName}> list = baseMapper.selectPage(page, where);
-##        TableDataInfo rspData = new TableDataInfo();
-##        rspData.setRows(list.getRecords());
-##        rspData.setTotal(list.getTotal());
-##        rspData.setCode(200);
-##        rspData.setMsg("查询成功");
-##        return rspData;
-
-
+    public TableDataInfo<${ClassName}> selectPage(${ClassName} ${className}) {
         //未删除
         ${className}.setDeleted(0L);
         Page<${ClassName}> page;