|
@@ -137,8 +137,10 @@ public class WmDaAgentController {
|
|
|
WmDaAgent wmDaAgent1 = new WmDaAgent();
|
|
|
wmDaAgent1.setDeptId(String.valueOf(id));
|
|
|
WmDaAgent wmDaAgent2 = wmDaAgentMapper.selectDeptId(wmDaAgent1);
|
|
|
- wmDaAgent2.setMahSettleFlag(wmDaAgent2.getMahSettleDeptId() != null);
|
|
|
- wmDaAgentList.add(wmDaAgent2);
|
|
|
+ if (wmDaAgent2 != null) {
|
|
|
+ wmDaAgent2.setMahSettleFlag(wmDaAgent2.getMahSettleDeptId() != null);
|
|
|
+ wmDaAgentList.add(wmDaAgent2);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
//每页数据条数
|