Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

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

@@ -71,6 +71,10 @@ public class ClerkController extends WebBaseController{
 				if(CollectionUtil.isNotEmpty(clerkCodes)){
 					List<ClerkDTO> clerkList = clerkService.listClerk(storeId, clerkCodes, false);
 					result = EntityUtil.changeEntityListByJSON(ClerkVo.class, clerkList);
+				}else{
+					clerkCodes.add("xxxXXXX");
+					List<ClerkDTO> clerkList = clerkService.listClerk(storeId, clerkCodes, false);
+					result = EntityUtil.changeEntityListByJSON(ClerkVo.class, clerkList);
 				}
 			}else{
 				List<String> clerkCodes = new ArrayList();

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

@@ -91,6 +91,10 @@ public class ClerkController extends WebBaseController{
 				if(CollectionUtil.isNotEmpty(clerkCodes)){
 					List<ClerkDTO> clerkList = clerkService.listClerk(storeId, clerkCodes, false);
 					result = EntityUtil.changeEntityListByJSON(ClerkVo.class, clerkList);
+				}else{
+					clerkCodes.add("xxxXXXX");
+					List<ClerkDTO> clerkList = clerkService.listClerk(storeId, clerkCodes, false);
+					result = EntityUtil.changeEntityListByJSON(ClerkVo.class, clerkList);
 				}
 			}else{
 				List<String> clerkCodes = new ArrayList();