|
@@ -1429,8 +1429,10 @@ public class WorkFullManageController extends BaseController {
|
|
|
//承办部门
|
|
|
User user=UserUtils.get(ruralProjectRecords.getProjectMasterId());
|
|
|
Office userOffice = user.getOffice();
|
|
|
- while (!"ffe5af5b557e46f28b000c94716e228a".equals(userOffice.getParent().getId())){
|
|
|
- userOffice = officeService.get(userOffice.getParent().getId());
|
|
|
+ Office parentOffice = officeService.get(userOffice.getParent().getId());
|
|
|
+ while (!"0".equals(parentOffice.getParent().getId())){
|
|
|
+ userOffice = parentOffice;
|
|
|
+ parentOffice = officeService.get(userOffice.getParent().getId());
|
|
|
}
|
|
|
if (StringUtils.isNotBlank(userOffice.getName())){
|
|
|
data.put("officeName",userOffice.getName());
|