Merge branch 'V0.0.7.409' of http://10.87.21.221:8000/jzyd_yyds/soc into V0.0.7.409

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysOrgMapper.xml

@@ -837,6 +837,7 @@ and
                 LEFT JOIN sys_org_extend b ON a.org_id = b.org_id
         WHERE c.type=4
           and c.deleted = 0
+          and c.is_lock = 0
           and c.path like concat(#{orgPath}, '%')
         GROUP BY
             a.org_id
@@ -1249,6 +1250,7 @@ and a.org_path LIKE concat(#{orgPath}, '%')
          is_lock=0 AND
             type = #{type}
           AND deleted = 0
+          AND is_lock = 0
           <if test="path != null">
               AND path LIKE concat(#{path}, '%')
           </if>