update

edu-im/edu-im-server/src/main/java/com/keao/edu/im/service/Impl/RoomServiceImpl.java

@@ -1490,11 +1490,11 @@ public class RoomServiceImpl implements RoomService {
             //房间销毁
         }else if(notify.getEvent() == 11){
             //成员加入
-            if(roomMember.getRole() != 3){
-                this.configRecord(roomId);
-            }else {
-                this.startRecord(roomId,userId,notify.getTimestamp() + "");
-            }
+//            if(roomMember.getRole() != 3){
+//                this.configRecord(roomId);
+//            }else {
+//                this.startRecord(roomId,userId,notify.getTimestamp() + "");
+//            }
         }else if(notify.getEvent() == 12){
             //成员退出
             /*if(roomMember.getRole() != 3){

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/impl/OrganizationServiceImpl.java

@@ -330,7 +330,7 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 			throw new BizException("操作失败：不支持此操作");
 		}
 		if(lockFlag == 1){
-			List<Integer> organIds = getNextLevelOrganIds(organId, true);
+			List<Integer> organIds = getChildOrganIds(organId, true);
 			employeeDao.batchLock(organIds);
 		}else {
 			Employee employee = employeeDao.get(organization.getUserId());

edu-user/edu-user-biz/src/main/resources/config/mybatis/OrganizationMapper.xml

@@ -158,7 +158,7 @@
 	</select>
 
 	<select id="getNextLevelOrganIds" resultType="int">
-		SELECT id_ FROM organization WHERE parent_organ_id_ =#{organId} AND id_!=#{organId};
+		SELECT id_ FROM organization WHERE parent_organ_id_ = #{organId} AND id_!=#{organId};
 	</select>
     <select id="getOrgans" resultMap="Organization">
 		SELECT <include refid="organizationColumn"/> FROM organization o WHERE id_ IN