Merge remote-tracking branch 'origin/master' into master

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

@@ -86,9 +86,9 @@ public class ScheduleUserDateServiceImpl extends SuperServiceImpl<ScheduleUserDa
         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 c_auth_user u LEFT JOIN c_core_org o on u.org_id = o.id ";
+        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 ";
+        sql+=" where 1=1 AND issu.user_id = u.id";
         sql+=genCustSearchParam(map);
         sql += " order by u.name desc limit  "+current+","+size+"";
         return sql;
@@ -100,8 +100,8 @@ public class ScheduleUserDateServiceImpl extends SuperServiceImpl<ScheduleUserDa
      * @return
      */
     private String getCount(Map<String, String> map){
-        String sql = " select count(1) count from c_auth_user u LEFT JOIN c_core_org o on u.org_id = o.id ";
-        sql+=" where 1=1 ";
+        String sql = " select count(1) count from imcs_s_schedule_user issu, c_auth_user u LEFT JOIN c_core_org o on u.org_id = o.id ";
+        sql+=" where 1=1 AND issu.user_id = u.id";
         sql+=genCustSearchParam(map);
         return sql;
     }
@@ -160,7 +160,7 @@ public class ScheduleUserDateServiceImpl extends SuperServiceImpl<ScheduleUserDa
             sql += " and u.name like '%"+userName+"%'";
         }
         if(StrUtil.isNotEmpty(deptId)){
-            sql += " and o.id = '"+deptId+"'";
+            sql += " and u.org_id = '"+deptId+"'";
         }
         return sql;
     }