|
|
@@ -17,6 +17,7 @@ import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.util.ArrayList;
|
|
|
+import java.util.LinkedList;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
import java.util.stream.Collectors;
|
|
|
@@ -92,7 +93,15 @@ public class ReportSearchConfigurationServiceImpl extends ServiceImpl<ReportSear
|
|
|
}
|
|
|
//查询用户配置的查询保险公司
|
|
|
if("select-single".equals(showType) && searchKey.equals(SearchKeyCodeEnum.SEARCHKEY_COMPANYID.getCode())){
|
|
|
- return queryCompanyListByUserId(userId);
|
|
|
+ List<ReportDictDto> companyList = queryCompanyListByUserId(userId);
|
|
|
+ if (companyList == null) {
|
|
|
+ companyList = new ArrayList<>();
|
|
|
+ }
|
|
|
+ LinkedList<ReportDictDto> linkedList = new LinkedList<>(companyList);
|
|
|
+ ReportDictDto allItem = new ReportDictDto("0", "全部");
|
|
|
+ linkedList.addFirst(allItem);
|
|
|
+ companyList = linkedList;
|
|
|
+ return companyList;
|
|
|
}
|
|
|
//查询用户配置的出单机构
|
|
|
if("date-tree".equals(showType) && searchKey.equals(SearchKeyCodeEnum.SEARCHKEY_ORGIDS.getCode())){
|