Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/service/impl/InspectionServiceImpl.java

@@ -73,6 +73,7 @@ public class InspectionServiceImpl extends BaseServiceImpl<Long, Inspection> imp
                 inspectionItem.setInspectionId(inspection.getId());
                 inspectionItem.setOrganId(inspection.getOrganId());
                 inspectionItem.setUserId(inspection.getUserId());
+                inspectionItem.setMemo("");
                 inspectionItem.setOperation(operationUserId);
                 inspectionItem.setCreateTime(nowDate);
                 inspectionItem.setUpdateTime(nowDate);
@@ -128,6 +129,7 @@ public class InspectionServiceImpl extends BaseServiceImpl<Long, Inspection> imp
             addItem.setInspectionId(oldInspection.getId());
             addItem.setOrganId(oldInspection.getOrganId());
             addItem.setUserId(oldInspection.getUserId());
+            addItem.setMemo("");
             addItem.setOperation(operationUserId);
             addItem.setCreateTime(nowDate);
             addItem.setUpdateTime(nowDate);

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TeacherLeaveRecordServiceImpl.java

@@ -107,7 +107,7 @@ public class TeacherLeaveRecordServiceImpl extends BaseServiceImpl<Long, Teacher
 		}
 		teacherLeaveRecordDao.insert(teacherLeaveRecord);
 		Set<Integer> roleIds = new HashSet<>(1);
-		roleIds.add(SysUserRole.DEAN_OF_STUDIES);
+		roleIds.add(SysUserRole.SECTION_MANAGER);
 		Teacher teacher = teacherDao.get(sysUser.getId());
 		Set<Integer> userIds = musicGroupDao.queryUserIdByRoleId(roleIds,teacher.getTeacherOrganId());
 		if (userIds != null && userIds.size() > 0) {

mec-biz/src/main/resources/config/mybatis/IndexBaseMonthDataMapper.xml

@@ -621,21 +621,21 @@
 	</select>
 	<select id="queryInspectionItem" resultType="java.lang.Long">
 		SELECT DISTINCT ii.id_ FROM inspection_item ii
-		WHERE ii.times_ > planned_times_ AND ii.item_ = 'INSPECT' AND ii.memo_ IS NULL
+		WHERE ii.times_ > planned_times_ AND ii.item_ = 'INSPECT' AND ii.memo_ =''
 		<if test="organIdsStr != null and organIdsStr != ''">
 			AND FIND_IN_SET(ii.organ_id_,#{organIdsStr})
 		</if>
 	</select>
 	<select id="queryInspectionItemPlan" resultType="java.lang.Long">
 		SELECT DISTINCT iip.id_ FROM inspection_item_plan iip
-		WHERE iip.status_ = 0 AND iip.memo_ IS NULL
+		WHERE iip.status_ = 0 AND iip.memo_ =''
 		<if test="organIdsStr != null and organIdsStr != ''">
 			AND FIND_IN_SET(iip.organ_id_,#{organIdsStr})
 		</if>
 	</select>
 	<select id="queryStudentVisit" resultType="java.lang.Long">
 		SELECT DISTINCT ii.id_ FROM inspection_item ii
-		WHERE ii.item_ = 'VISIT' AND ii.memo_ IS NULL
+		WHERE ii.item_ = 'VISIT' AND ii.memo_ =''
 		AND ii.times_ > (SELECT COUNT(DISTINCT sv.id_) FROM student_visit sv
 		WHERE sv.teacher_id_ = ii.user_id_ AND DATE_FORMAT(ii.create_time_,'%Y-%m') = DATE_FORMAT(sv.visit_time_,'%Y-%m'))
 		<if test="organIdsStr != null and organIdsStr != ''">