|
@@ -1004,15 +1004,15 @@ public class ZhcxProjectManageServiceImpl extends ServiceImpl<ZhcxProjectManageD
|
|
|
machine.setDutydeptid(dutyDepartOrg.getString("ID"));
|
|
|
|
|
|
//一级部门
|
|
|
- JSONObject firstObj = orgIdMap.get(departOrg.getString("PID"));
|
|
|
+ JSONObject firstObj = orgIdMap.get(dutyDepartOrg.getString("PID"));
|
|
|
//如果上一级选择的基地内id,表示选择的是一级部门
|
|
|
// 选择一级部门
|
|
|
if("366d678e57384d0e92c4c5d0d3af2485".equals(firstObj.getString("ID"))) {//基地外
|
|
|
- machine.setFirstdutydeptid(departOrg.getString("ID"));
|
|
|
+ machine.setFirstdutydeptid(dutyDepartOrg.getString("ID"));
|
|
|
machine.setFirstdutydeptname(realDepartName);
|
|
|
machine.setDutyifoutsidebase("outside");
|
|
|
} else if("b0bd3ed27bfb4af08535c39f464b3d3a".equals(firstObj.getString("ID"))) {//长兴基地
|
|
|
- machine.setFirstdutydeptid(departOrg.getString("ID"));
|
|
|
+ machine.setFirstdutydeptid(dutyDepartOrg.getString("ID"));
|
|
|
machine.setFirstdutydeptname(realDepartName);
|
|
|
machine.setDutyifoutsidebase("inside");
|
|
|
}
|