Showing
1 changed file
with
12 additions
and
4 deletions
| @@ -528,15 +528,23 @@ public class ContractDistributorStandardController extends DefaultBaseController | @@ -528,15 +528,23 @@ public class ContractDistributorStandardController extends DefaultBaseController | ||
| 528 | if (CollectionUtils.isNotEmpty(depts)) { | 528 | if (CollectionUtils.isNotEmpty(depts)) { |
| 529 | String deptId = depts.get(0); | 529 | String deptId = depts.get(0); |
| 530 | SysDept sysDept = sysDeptService.findById(deptId); | 530 | SysDept sysDept = sysDeptService.findById(deptId); |
| 531 | - if (sysDept.getName().endsWith("区域") && StringUtils.isNotBlank(sysDept.getParentId())) { // 如果是**区域，则查询上一层次是否为**办事处，获取办事处code | 531 | + if (sysDept.getCode().equals("BF") || sysDept.getCode().equals("CZ") |
| 532 | + || sysDept.getCode().equals("DG") || sysDept.getCode().equals("FS") | ||
| 533 | + || sysDept.getCode().equals("NB") || sysDept.getCode().equals("SZ") | ||
| 534 | + || sysDept.getCode().equals("WM") || sysDept.getCode().equals("WZ") | ||
| 535 | + || sysDept.getCode().equals("ZT")) { //获取办事处code | ||
| 536 | + stringBuilder.append(sysDept.getCode()); | ||
| 537 | + } else { | ||
| 532 | SysDept parentSysDept = sysDeptService.findById(sysDept.getParentId()); | 538 | SysDept parentSysDept = sysDeptService.findById(sysDept.getParentId()); |
| 533 | - if (parentSysDept != null && parentSysDept.getName().endsWith("办事处")) { | 539 | + if (parentSysDept != null && (parentSysDept.getCode().equals("BF") || parentSysDept.getCode().equals("CZ") |
| 540 | + || parentSysDept.getCode().equals("DG") || parentSysDept.getCode().equals("FS") | ||
| 541 | + || parentSysDept.getCode().equals("NB") || parentSysDept.getCode().equals("SZ") | ||
| 542 | + || parentSysDept.getCode().equals("WM") || parentSysDept.getCode().equals("WZ") | ||
| 543 | + || parentSysDept.getCode().equals("ZT"))) { | ||
| 534 | stringBuilder.append(parentSysDept.getCode()); | 544 | stringBuilder.append(parentSysDept.getCode()); |
| 535 | } else { | 545 | } else { |
| 536 | stringBuilder.append(sysDept.getCode()); | 546 | stringBuilder.append(sysDept.getCode()); |
| 537 | } | 547 | } |
| 538 | - } else { | ||
| 539 | - stringBuilder.append(sysDept.getCode()); | ||
| 540 | } | 548 | } |
| 541 | } | 549 | } |
| 542 | } | 550 | } |