修复已知问题
This commit is contained in:
@@ -35,9 +35,6 @@ public class WebsiteFieldController extends BaseController {
|
||||
@ApiOperation("分页查询应用参数")
|
||||
@GetMapping("/page")
|
||||
public ApiResult<PageResult<WebsiteField>> page(WebsiteFieldParam param) {
|
||||
// PageParam<WebsiteField, WebsiteFieldParam> page = new PageParam<>(param);
|
||||
// page.setDefaultOrder("create_time desc");
|
||||
// return success(websiteFieldService.page(page, page.getWrapper()));
|
||||
// 使用关联查询
|
||||
return success(websiteFieldService.pageRel(param));
|
||||
}
|
||||
@@ -45,9 +42,6 @@ public class WebsiteFieldController extends BaseController {
|
||||
@ApiOperation("查询全部应用参数")
|
||||
@GetMapping()
|
||||
public ApiResult<List<WebsiteField>> list(WebsiteFieldParam param) {
|
||||
// PageParam<WebsiteField, WebsiteFieldParam> page = new PageParam<>(param);
|
||||
// page.setDefaultOrder("create_time desc");
|
||||
// return success(websiteFieldService.list(page.getOrderWrapper()));
|
||||
// 使用关联查询
|
||||
return success(websiteFieldService.listRel(param));
|
||||
}
|
||||
@@ -55,9 +49,8 @@ public class WebsiteFieldController extends BaseController {
|
||||
@ApiOperation("根据id查询应用参数")
|
||||
@GetMapping("/{id}")
|
||||
public ApiResult<WebsiteField> get(@PathVariable("id") Integer id) {
|
||||
return success(websiteFieldService.getById(id));
|
||||
// 使用关联查询
|
||||
//return success(websiteFieldService.getByIdRel(id));
|
||||
return success(websiteFieldService.getByIdRel(id));
|
||||
}
|
||||
|
||||
@PreAuthorize("hasAuthority('system:websiteField:save')")
|
||||
|
||||
@@ -264,7 +264,7 @@
|
||||
<where>
|
||||
AND a.deleted = 0
|
||||
AND a.phone = #{phone}
|
||||
AND a.username = 'admin'
|
||||
AND (a.username = 'superAdmin' OR a.username = 'admin')
|
||||
</where>
|
||||
</select>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user