Merge remote-tracking branch 'origin/V0.0.9' into V0.0.9

soc-modules/soc-modules-core/src/main/resources/mapper/board/CockpitMapper.xml

@@ -286,14 +286,14 @@
                      (select * FROM
                          (
                          <if test="type == 3">
-                             SELECT id ,if(breviary is null,short_name,breviary) as org_name,path,sort as tj_sort FROM sys_org WHERE type = 4 AND deleted = 0 and path LIKE CONCAT(#{orgPath},'%') ) a
+                             SELECT id ,if(breviary is null,short_name,breviary) as org_name,path,sort as tj_sort FROM sys_org WHERE type = 4 AND deleted = 0 AND is_lock=0 and path LIKE CONCAT(#{orgPath},'%') ) a
                          </if>
                          <if test="type == 1">
-                             SELECT id ,path FROM sys_org WHERE type = 4 AND deleted = 0 and path LIKE CONCAT(#{orgPath},'%') ) a
+                             SELECT id ,path FROM sys_org WHERE type = 4 AND deleted = 0 AND is_lock=0 and path LIKE CONCAT(#{orgPath},'%') ) a
                              LEFT JOIN (SELECT path as dq_path,breviary as org_name,sort as tj_sort FROM sys_org where `name` LIKE CONCAT('%','地区行社') and deleted = 0) c on a.path like CONCAT(c.dq_path,'%')
                          </if>
                          <if test="type == 2">
-                             SELECT id ,path FROM sys_org WHERE type = 4 AND deleted = 0 and path LIKE CONCAT(#{orgPath},'%') ) a
+                             SELECT id ,path FROM sys_org WHERE type = 4 AND deleted = 0 AND is_lock=0 and path LIKE CONCAT(#{orgPath},'%') ) a
                              LEFT JOIN (SELECT path as dq_path,if(breviary is null,short_name,breviary) as org_name,sort as tj_sort FROM sys_org where type = 3 and deleted = 0) c on a.path like CONCAT(c.dq_path,'%')
                          </if>