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

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

@@ -132,7 +132,16 @@ public class StoreController extends WebBaseController{
 			}
 		}
 		if(CollectionUtils.isNotEmpty(resultList)){
-			resultList = resultList.stream().sorted(Comparator.comparing(StoreVO::getBindFlag).reversed().thenComparing(StoreVO::getCreateTime)).collect(Collectors.toList());
+			Map<Integer,StoreVO> map = com.gic.commons.util.CollectionUtil.toMap(resultList, "clerkType");
+			if(map.containsKey(1)){
+				//店长
+				resultList = resultList.stream().sorted(Comparator.comparing(StoreVO::getBindFlag).thenComparing(StoreVO::getClerkType,Comparator.reverseOrder()).thenComparing(StoreVO::getCreateTime,Comparator.reverseOrder())).collect(Collectors.toList());
+			}else{
+				//店员
+				resultList = resultList.stream().sorted(Comparator.comparing(StoreVO::getBindFlag).thenComparing(StoreVO::getClerkType,Comparator.reverseOrder()).thenComparing(StoreVO::getCreateTime,Comparator.reverseOrder())).collect(Collectors.toList());
+			}
+			
+			
 		}
 		return resultResponse(HaoBanErrCode.ERR_1,resultList);
 	}