|
@@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestBody;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
+import java.util.ArrayList;
|
|
|
import java.util.Arrays;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
@@ -107,6 +108,9 @@ public class CxCommonController {
|
|
|
SEARCH_COLUMN_VO.setValue(topOrgId);
|
|
|
COLUMN_QUERY_TYPE.setColumns(Arrays.asList(SEARCH_COLUMN_VO));
|
|
|
List<ColumnQueryType> columnQueryTypes = criteriaQuery.getColumnQueryTypes();
|
|
|
+ if(columnQueryTypes == null){
|
|
|
+ columnQueryTypes = new ArrayList<>();
|
|
|
+ }
|
|
|
columnQueryTypes.add(COLUMN_QUERY_TYPE);
|
|
|
criteriaQuery.setColumnQueryTypes(columnQueryTypes);
|
|
|
return R.ok(criteriaQuery);
|