Your ROOT_URL in app.ini is http://git.zky.com/ but you are visiting http://61.178.84.89:8998/wangxy/work-portal/commit/4142d19ca94ea22a8ee34294fc0bc46d115f781a?style=split&whitespace=ignore-change You should set ROOT_URL correctly, otherwise the web may not work correctly.
wangxy
/
work-portal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/special-20250331' into special-20250331

Browse Source
special-20250331
dshclm 2 weeks ago
parent 54bb51ae1a 0acf005182
commit 4142d19ca9
1 changed files with 2 additions and 2 deletions

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/home/HomeController.java
Unescape View File

@ -115,7 +115,7 @@ public class HomeController {
queryWrapper.eq(SysColumn::getColumnType, SPECIAL_COLUMN_TYPE); queryWrapper.eq(SysColumn::getColumnType, SPECIAL_COLUMN_TYPE);
queryWrapper.eq(SysColumn::getColumnGrade, COLUMN_GRADE); queryWrapper.eq(SysColumn::getColumnGrade, COLUMN_GRADE);
queryWrapper.eq(SysColumn::getStatus,STATUS); queryWrapper.eq(SysColumn::getStatus,STATUS);
queryWrapper.last("limit 10"); queryWrapper.last("limit 12");
queryWrapper.orderByAsc(SysColumn::getOrderNum); queryWrapper.orderByAsc(SysColumn::getOrderNum);
List<SysColumn> specialColumns = columnService.list(queryWrapper); List<SysColumn> specialColumns = columnService.list(queryWrapper);
mmap.put("specialColumns", specialColumns); mmap.put("specialColumns", specialColumns);
@ -181,7 +181,7 @@ public class HomeController {
queryWrapper.eq(SysColumn::getColumnType, SPECIAL_COLUMN_TYPE); queryWrapper.eq(SysColumn::getColumnType, SPECIAL_COLUMN_TYPE);
queryWrapper.eq(SysColumn::getColumnGrade, COLUMN_GRADE); queryWrapper.eq(SysColumn::getColumnGrade, COLUMN_GRADE);
queryWrapper.eq(SysColumn::getStatus,STATUS); queryWrapper.eq(SysColumn::getStatus,STATUS);
queryWrapper.last("limit 10"); queryWrapper.last("limit 12");
queryWrapper.orderByAsc(SysColumn::getOrderNum); queryWrapper.orderByAsc(SysColumn::getOrderNum);
List<SysColumn> specialColumns = columnService.list(queryWrapper); List<SysColumn> specialColumns = columnService.list(queryWrapper);
mmap.put("specialColumns", specialColumns); mmap.put("specialColumns", specialColumns);

Write Preview
Loading…
Cancel
Save