|
@@ -125,7 +125,8 @@ public class DictionaryDemandController {
|
|
|
*/
|
|
|
@PostMapping("/queryDraft")
|
|
|
public CommonResult<List<DictionaryDemand>> queryDraft(@RequestBody Map<String, Object> map) {
|
|
|
- if(map.get(ORDER_COLUMN) == null) {
|
|
|
+ List orderList = (List) map.get(ORDER_COLUMN);
|
|
|
+ if(CollUtil.isEmpty(orderList)) {
|
|
|
OrderItem order = OrderItem.desc(AuditableEntity.DO_PROP_CREATIONTIME);
|
|
|
map.put(ORDER_COLUMN, CollUtil.newArrayList(order));
|
|
|
}
|
|
@@ -139,7 +140,8 @@ public class DictionaryDemandController {
|
|
|
*/
|
|
|
@PostMapping("/querySubmitted")
|
|
|
public CommonResult<List<DictionaryDemand>> querySubmitted(@RequestBody Map<String, Object> map) {
|
|
|
- if(map.get(ORDER_COLUMN) == null) {
|
|
|
+ List orderList = (List) map.get(ORDER_COLUMN);
|
|
|
+ if(CollUtil.isEmpty(orderList)) {
|
|
|
OrderItem order = OrderItem.desc(AuditableEntity.DO_PROP_MODIFIEDTIME);
|
|
|
map.put(ORDER_COLUMN, CollUtil.newArrayList(order));
|
|
|
}
|
|
@@ -155,7 +157,8 @@ public class DictionaryDemandController {
|
|
|
*/
|
|
|
@PostMapping("/queryTodo")
|
|
|
public CommonResult<List<DictionaryDemand>> queryTodo(@RequestBody Map<String, Object> map) {
|
|
|
- if(map.get(ORDER_COLUMN) == null) {
|
|
|
+ List orderList = (List) map.get(ORDER_COLUMN);
|
|
|
+ if(CollUtil.isEmpty(orderList)) {
|
|
|
OrderItem order = OrderItem.desc(AuditableEntity.DO_PROP_MODIFIEDTIME);
|
|
|
map.put(ORDER_COLUMN, CollUtil.newArrayList(order));
|
|
|
}
|
|
@@ -169,7 +172,8 @@ public class DictionaryDemandController {
|
|
|
*/
|
|
|
@PostMapping("/queryDone")
|
|
|
public CommonResult<List<DictionaryDemand>> queryDone(@RequestBody Map<String, Object> map) {
|
|
|
- if(map.get(ORDER_COLUMN) == null) {
|
|
|
+ List orderList = (List) map.get(ORDER_COLUMN);
|
|
|
+ if(CollUtil.isEmpty(orderList)) {
|
|
|
OrderItem order = OrderItem.desc(AuditableEntity.DO_PROP_MODIFIEDTIME);
|
|
|
map.put(ORDER_COLUMN, CollUtil.newArrayList(order));
|
|
|
}
|