|
|
@@ -1,5 +1,6 @@
|
|
1
|
1
|
package api.controller.system;
|
|
2
|
2
|
|
|
|
3
|
+import api.entity.database.call.CallLog;
|
|
3
|
4
|
import api.entity.database.system.Menu;
|
|
4
|
5
|
import api.entity.database.system.WorkroderType;
|
|
5
|
6
|
import api.service.system.IWorkroderTypeService;
|
|
|
@@ -44,6 +45,7 @@ public class WorkroderTypeController extends BaseController {
|
|
44
|
45
|
qw.eq(input.getCreate_time() != null , WorkroderType::getCreate_time, input.getCreate_time());
|
|
45
|
46
|
qw.eq(WorkroderType::getIsDelete, 0);
|
|
46
|
47
|
qw.like(!StringHelper.isEmpty(input.getCreateBy()), WorkroderType::getCreateBy, input.getCreateBy());
|
|
|
48
|
+ qw.orderByDesc(WorkroderType::getTypeOrder);
|
|
47
|
49
|
if (pageInput.getPageNum() == null) {
|
|
48
|
50
|
pageInput.setPageNum(1);
|
|
49
|
51
|
}
|
|
|
@@ -173,6 +175,7 @@ public class WorkroderTypeController extends BaseController {
|
|
173
|
175
|
public AjaxResult treeselect(Menu menu) {
|
|
174
|
176
|
LambdaQueryWrapper<WorkroderType> qw = new LambdaQueryWrapper<>();
|
|
175
|
177
|
qw.eq(WorkroderType::getIsDelete, 0);
|
|
|
178
|
+ qw.orderByDesc(WorkroderType::getTypeOrder);
|
|
176
|
179
|
List<WorkroderType> menus = workrodertypeService.getList(qw);
|
|
177
|
180
|
return Success("获取菜单下拉树列表成功", workrodertypeService.buildMenuTreeSelect(menus));
|
|
178
|
181
|
}
|