|
|
@@ -626,19 +626,17 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
params.put("name", in.getName());
|
|
|
}
|
|
|
// 计算出所有本部门及所属部门的ID
|
|
|
- List<String>ls= JSON.parseArray(in.getDeps(),String.class);
|
|
|
- List<String>departmentList=new ArrayList<>();
|
|
|
if(in.getSpecially()==1||in.getSpecially()==5) {
|
|
|
- if (in.getDeps()!=null&&!ls.isEmpty()){
|
|
|
+ List<String>departmentList=new ArrayList<>();
|
|
|
+ if (in.getDeps()!=null){
|
|
|
departmentList=departmentService.selectSubDeps(in.getDeps());
|
|
|
}else {
|
|
|
departmentList=departmentService.selectMyDeps();
|
|
|
}
|
|
|
params.put("deps",departmentList);
|
|
|
}else {
|
|
|
- if (in.getDeps()!=null&&!ls.isEmpty()) {
|
|
|
- departmentList= ls;
|
|
|
- params.put("deps",departmentList);
|
|
|
+ if (in.getDeps()!=null) {
|
|
|
+ params.put("deps",departmentService.parseArray(in.getDeps()));
|
|
|
}
|
|
|
}
|
|
|
|