李学松 преди 2 години
родител
ревизия
dc33b5936a
променени са 1 файла, в които са добавени 4 реда и са изтрити 2 реда
  1. 4 2
      hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmDaAgentController.java

+ 4 - 2
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmDaAgentController.java

@@ -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);
+				}
 			}
 		}
 		//每页数据条数