bug修复

src/main/java/com/xjrsoft/module/concat/controller/ConcatController.java

@@ -63,7 +63,7 @@ public class ConcatController {
         }
         MPJLambdaWrapper<XjrUser> wrapper = new MPJLambdaWrapper<>();
         wrapper.leftJoin("xjr_user_dept_relation t2 on t.id = t2.user_id")
-                .like("t5.hierarchy", parentId + "-")
+                .like("t5.hierarchy", parentId)
                 .leftJoin("xjr_user_role_relation t3 ON t.id = t3.user_id")
                 .leftJoin("xjr_role t4 ON t4.id = t3.role_id")
                 .leftJoin("xjr_department t5 ON t2.dept_id = t5.id")

src/main/java/com/xjrsoft/module/job/JianyuekbScheduleTask.java

@@ -74,22 +74,27 @@ public class JianyuekbScheduleTask {
 
             gradeClassMaps.put(el.get("jianyue_id").toString(), classIds);
         }
-
+        LocalDate today = LocalDate.now();
         for (Map<String, Object> receiveMsg : receiveMsgs) {
             String updSql = "update course_receive_msg set is_callback = 0 where id = " + receiveMsg.get("id").toString();
             SqlRunnerAdapter.db().update(updSql);
 
             String eduYearSerialNo = receiveMsg.get("edu_year_serial_no").toString();
             String startDateStr = receiveMsg.get("start_date").toString();
+            LocalDate startDateObj = LocalDate.parse(startDateStr);
             String endDateStr = receiveMsg.get("end_date").toString();
+            LocalDate endDateObj = LocalDate.parse(endDateStr);
+            if(today.isAfter(startDateObj)){
+                startDateStr = today.format(formatter);
+            }
             //删除课表信息
-            String delSql = "delete from course_table where schedule_date between DATE_FORMAT(NOW(), '%Y-%m-%d')" +
+            String delSql = "delete from course_table where schedule_date between '" + startDateStr + "'" +
                     " and '" + endDateStr + "'" +
                     " and class_id in (" + gradeClassMaps.get(eduYearSerialNo).toString().replace("[","").replace("]","")+ ")";
             SqlRunnerAdapter.db().delete(delSql);
 
-            LocalDate startDateObj = LocalDate.parse(startDateStr);
-            LocalDate endDateObj = LocalDate.parse(endDateStr);
+
+
             long between = ChronoUnit.DAYS.between(startDateObj, endDateObj);
             int times = Integer.parseInt(((between / 7) + 1) + "");