|
|
|
@ -239,7 +239,14 @@ public class CompanyServiceImpl implements CompanyService { |
|
|
|
@Override |
|
|
|
public Object call() throws Exception { |
|
|
|
List<Object> childForMaterialTypeByParent = findChildForMaterialTypeByParent(ap,userByPort); |
|
|
|
Map<String, Object> stringObjectMap = InitTreeMenus(ap,childForMaterialTypeByParent); |
|
|
|
Map<String, Object> stringObjectMap = null; |
|
|
|
if(childForMaterialTypeByParent == null){ |
|
|
|
List<Object> objectList = addDepartMentHead(ap, userByPort); |
|
|
|
stringObjectMap = InitTreeMenus(ap,objectList); |
|
|
|
}else{ |
|
|
|
stringObjectMap = InitTreeMenus(ap,childForMaterialTypeByParent); |
|
|
|
} |
|
|
|
|
|
|
|
return stringObjectMap; |
|
|
|
} |
|
|
|
} |
|
|
|
@ -330,9 +337,10 @@ public class CompanyServiceImpl implements CompanyService { |
|
|
|
List<UserByPort> DepartmentHeads = new ArrayList<>(); |
|
|
|
for (int i = 0; i < list.size(); i++) { |
|
|
|
UserByPort userByPort = JSONObject.toJavaObject((JSONObject) list.get(i), UserByPort.class); |
|
|
|
if(userByPort.getPersonincharge() == 1){ |
|
|
|
/*if(userByPort.getPersonincharge() == 1){ |
|
|
|
DepartmentHeads.add(userByPort); |
|
|
|
}*/ |
|
|
|
DepartmentHeads.add(userByPort); |
|
|
|
} |
|
|
|
} |
|
|
|
return DepartmentHeads; |
|
|
|
} |
|
|
|
|