Merge branch 'developer' into 'master'

兼容

See merge request !69

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

 package com.gic.haoban.manage.service.service.impl;
 
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.Set;
@@ -106,6 +107,9 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
 	}
 	@Override
 	public List<StaffClerkRelationDTO> listByClerkIds(List<String> clerkList) {
+		if(clerkList == null || clerkList.isEmpty()){
+			return Collections.EMPTY_LIST;
+		}
 		return EntityUtil.changeEntityListByJSON(StaffClerkRelationDTO.class,mapper.listByClerkIds(clerkList));
 	}
 }

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

@@ -167,6 +167,9 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
 	}
 	@Override
 	public List<StaffClerkRelationDTO> listByClerkIds(List<String> clerkIds) {
+		if(clerkIds == null || clerkIds.isEmpty()){
+			return Collections.EMPTY_LIST;
+		}
 		List<TabHaobanStaffClerkRelation> list = tabHaobanStaffClerkRelationMapper.listByClerkIds(clerkIds);
 		if(CollectionUtil.isEmpty(list)){
 			return new ArrayList<StaffClerkRelationDTO>();