设置班表调整，后续只用班表管理的设置班表新建，排班人员管理页面废除

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/classSchedule/service/impl/ScheduleUserDateServiceImpl.java

@@ -82,15 +82,24 @@ public class ScheduleUserDateServiceImpl extends SuperServiceImpl<ScheduleUserDa
      * @return
      */
     private String getQuerySql(Map<String, String> map,List<Map<String,Object>> dateList){
+//        int current = Integer.parseInt(StrUtil.isEmpty(map.get("current"))?"1":map.get("current").toString());
+//        int size = Integer.parseInt(StrUtil.isEmpty(map.get("size"))?"10":map.get("size").toString());
+//        current = (current-1)*size;
+//        String hangzhuanlieSql = gethangzhuanlieSQL(map,dateList);
+//        String sql = " select u.id userId,u.name userName,o.label orgName ,z.* from imcs_s_schedule_user issu, c_auth_user u LEFT JOIN c_core_org o on u.org_id = o.id ";
+//        sql+=" LEFT JOIN ("+hangzhuanlieSql+") z on u.id = z.user_id ";
+//        sql+=" where 1=1 AND issu.user_id = u.id";
+//        sql+=genCustSearchParam(map);
+//        sql += " order by u.name desc limit  "+current+","+size+"";
+
         int current = Integer.parseInt(StrUtil.isEmpty(map.get("current"))?"1":map.get("current").toString());
         int size = Integer.parseInt(StrUtil.isEmpty(map.get("size"))?"10":map.get("size").toString());
         current = (current-1)*size;
         String hangzhuanlieSql = gethangzhuanlieSQL(map,dateList);
-        String sql = " select u.id userId,u.name userName,o.label orgName ,z.* from imcs_s_schedule_user issu, c_auth_user u LEFT JOIN c_core_org o on u.org_id = o.id ";
-        sql+=" LEFT JOIN ("+hangzhuanlieSql+") z on u.id = z.user_id ";
-        sql+=" where 1=1 AND issu.user_id = u.id";
+        String sql = " select u.id userId,u.name userName,o.label orgName ,z.* from (" + hangzhuanlieSql +" ) z,   c_auth_user u , c_core_org o where 1=1 and u.org_id = o.id AND z.user_id = u.id";
         sql+=genCustSearchParam(map);
         sql += " order by u.name desc limit  "+current+","+size+"";
+
         return sql;
     }