manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
thinkgem
2023-04-08 13:31:44 +08:00
parent 6e62c9fa83
commit 063d137afd
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
modules/cms/src/main/java/com/jeesite/modules/cms/db/InitCmsData.xlsx
View File

Binary file not shown.

2
modules/cms/src/main/java/com/jeesite/modules/cmsfront/web/FrontController.java
View File

@@ -313,7 +313,7 @@ public class FrontController extends BaseController {
@RequestMapping(value = "comment-{theme}", method = RequestMethod.GET) @RequestMapping(value = "comment-{theme}", method = RequestMethod.GET)
public String comment(Comment comment, @PathVariable String theme, HttpServletRequest request, HttpServletResponse response, public String comment(Comment comment, @PathVariable String theme, HttpServletRequest request, HttpServletResponse response,
Model model) { Model model) {
Page<Comment> page = new Page<Comment>(request, response); Page<Comment> page = new Page<>(request, response);
Comment c = new Comment(); Comment c = new Comment();
c.setCategory(comment.getCategory()); c.setCategory(comment.getCategory());
c.setArticleId(comment.getArticleId()); c.setArticleId(comment.getArticleId());

2
modules/cms/src/main/java/com/jeesite/modules/cmsfront/web/FrontSearchController.java
View File

@@ -56,7 +56,7 @@ public class FrontSearchController extends BaseController{
// 文章检索 // 文章检索
if (StringUtils.isBlank(t) || "article".equals(t)){ if (StringUtils.isBlank(t) || "article".equals(t)){
Page<Map<String, Object>> page = new Page<Map<String, Object>>(request, response); Page<Map<String, Object>> page = new Page<>(request, response);
Map<String, String> parmas = MapUtils.newHashMap(); Map<String, String> parmas = MapUtils.newHashMap();
if (StringUtils.isNotBlank(siteCode)){ if (StringUtils.isNotBlank(siteCode)){
parmas.put("siteCode", siteCode); parmas.put("siteCode", siteCode);

4
modules/core/src/main/java/com/jeesite/modules/sys/web/user/UserController.java
View File

@@ -53,10 +53,10 @@ public class UserController extends BaseController {
@ResponseBody @ResponseBody
public Page<User> listData(User user, HttpServletRequest request, HttpServletResponse response) { public Page<User> listData(User user, HttpServletRequest request, HttpServletResponse response) {
// if (User.USER_TYPE_NONE.equals(user.getUserType())){ // if (User.USER_TYPE_NONE.equals(user.getUserType())){
// return new Page<User>(request, response); // return new Page<>(request, response);
// } // }
if (Global.isStrictMode() && !user.currentUser().isAdmin()){ if (Global.isStrictMode() && !user.currentUser().isAdmin()){
return new Page<User>(request, response); return new Page<>(request, response);
} }
user.setPage(new Page<>(request, response)); user.setPage(new Page<>(request, response));
Page<User> page = userService.findPage(user); Page<User> page = userService.findPage(user);

2
modules/core/src/test/java/com/jeesite/test/DaoMapperTest.java
View File

@@ -178,7 +178,7 @@ public class DaoMapperTest extends BaseSpringContextTests {
System.out.println("============ 分页测试，查询子节点 ============"); System.out.println("============ 分页测试，查询子节点 ============");
Company company4 = new Company("1"); Company company4 = new Company("1");
company4.setFullName(company.getFullName()); company4.setFullName(company.getFullName());
company4.setPage(new Page<Company>(1, 2)); company4.setPage(new Page<>(1, 2));
company4.setIsQueryChildren(true); company4.setIsQueryChildren(true);
List<Company> companyListPage = companyDao.findList(company4); List<Company> companyListPage = companyDao.findList(company4);
Assert.assertEquals("find page list size", companyListPage.size(), 2); Assert.assertEquals("find page list size", companyListPage.size(), 2);