提交 4170021d authored 作者: 000516's avatar 000516

修改Arrays.asList()

上级 b9a1640a
......@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.GetMapping;
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.Optional;
......@@ -114,7 +115,12 @@ public class ApDisplayQueryController {
Optional<SysRole> first = roles.stream().filter(role -> RoleConstants.DISTRICT_AP_MANAGER.equals(role.getRoleKey())).findFirst();
if (first.isPresent()) {
String deptName = loginUser.getSysUser().getDept().getDeptName();
salesApRequest.setDeptNames("000889".equals(empNo) ? Arrays.asList(deptName,"北京特区") : Arrays.asList(deptName));
salesApRequest.setDeptNames("000889".equals(empNo) ? new ArrayList<String>() {
{
add(deptName);
add("北京特区");
}
} : Arrays.asList(deptName));
return;
}
// 不是大区TM,判断是否是销售人员(人客关系)
......
......@@ -15,6 +15,7 @@ import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.awt.dnd.Autoscroll;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
......@@ -84,7 +85,7 @@ public class ApDisplayQueryServiceImpl implements IApDisplayQueryService {
salesApWq.setSalesMonth(salesApRequest.getSalesMonth() != null ? DateUtil.parse(salesApRequest.getSalesMonth() + "-01", DatePattern.NORM_DATE_PATTERN) : null);
// departmentName 部门名称
if (StringUtils.isNotBlank(salesApRequest.getDeptName())){
List<String> deptNames = CollectionUtils.isEmpty(salesApWq.getDeptNames()) ? Arrays.asList() : salesApWq.getDeptNames();
List<String> deptNames = CollectionUtils.isEmpty(salesApWq.getDeptNames()) ? new ArrayList<>() : salesApWq.getDeptNames();
deptNames.add(salesApRequest.getDeptName());
salesApWq.setDeptNames(deptNames);
}
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论