Merge branch 'developer' into 'master'

Developer

See merge request !4

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java

@@ -214,7 +214,7 @@ public class StaffApiServiceImpl implements StaffApiService {
 		StaffDepartmentRelatedDTO related = staffDepartmentRelatedService.selectById(staffDepartmentStaffRelatedId);
 		if(related != null) {
 			List<TabHaobanStaffDepartmentRelated> relatedList = staffDepartmentRelatedService.listStaffDepartmentByStaffId(related.getStaffId());
-			if(relatedList != null || relatedList.isEmpty()){
+			if(relatedList == null || relatedList.isEmpty()){
 				return;
 			}
 			//只在当前门店