fix

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/StaffController.java

@@ -73,14 +73,17 @@ public class StaffController extends WebBaseController{
 	public HaobanResponse staffList(String departmentId,Integer activeFlag,String keyword,BasePageInfo pageInfo){
 		Page<StaffDTO> page = staffApiService.pageStaff(departmentId,activeFlag,keyword,pageInfo);
 		List<StaffDTO> list = page.getResult();
-		for (StaffDTO staffDTO : list) {
-			logger.info("【成员列表】departmentId={},staffId={}",departmentId,staffDTO.getStaffId());
-			StaffDepartmentRelatedDTO related = staffApiService.getDepartmentIdAndStaffId(departmentId,staffDTO.getStaffId());
-			logger.info("【成员列表】related={}",JSON.toJSONString(related));
-			if(related != null) {
-				staffDTO.setStaffDepartmentRelatedId(related.getStaffDepartmentRelatedId());
+		if(list != null) {
+			for (StaffDTO staffDTO : list) {
+				logger.info("【成员列表】departmentId={},staffId={}",departmentId,staffDTO.getStaffId());
+				StaffDepartmentRelatedDTO related = staffApiService.getDepartmentIdAndStaffId(departmentId,staffDTO.getStaffId());
+				logger.info("【成员列表】related={}",JSON.toJSONString(related));
+				if(related != null) {
+					staffDTO.setStaffDepartmentRelatedId(related.getStaffDepartmentRelatedId());
+				}
 			}
 		}
+		
 		logger.info("【员工列表】page={}",JSON.toJSONString(page));
 		PageResult<StaffDTO> pageVo = new PageResult<>();
         pageVo.setList(list);