Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/BaseMonitor

base-system/src/main/java/com/ozs/system/service/ISysDeptService.java

@@ -16,7 +16,7 @@ public interface ISysDeptService extends JoinIService<SysDept> {
     /**
      * 查询部门管理数据
      *
-     * @param  
+     * @param
      * @return 部门信息集合
      */
     public List<SysDept> selectDeptList(SysDeptVo sysDeptVo);

base-system/src/main/java/com/ozs/system/service/impl/SysDeptServiceImpl.java

@@ -44,7 +44,7 @@ public class SysDeptServiceImpl extends JoinServiceImpl<SysDeptMapper, SysDept>
     /**
      * 查询部门管理数据
      *
-     * @param  
+     * @param
      * @return 部门信息集合
      */
     @Override
@@ -68,7 +68,7 @@ public class SysDeptServiceImpl extends JoinServiceImpl<SysDeptMapper, SysDept>
     /**
      * 查询部门树结构信息
      *
-     * @param  
+     * @param
      * @return 部门树信息集合
      */
     @Override

base-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -41,23 +41,6 @@
         <if test="deptName != null and deptName != ''">
             AND dept_name like concat('%', #{deptName}, '%')
         </if>
-        <if test="!dsFlay">
-            and
-            <trim prefix="(" prefixOverrides="or" suffix=")">
-                <if test="dsUserId != null and dsUserId != ''">
-                    or d.create_by=#{dsUserId}
-                </if>
-                <if test="dsDeptId != null and dsDeptId != 0">
-                    or d.dept_id=#{dsDeptId}
-                </if>
-                <if test="dsDeptIds != null">
-                    or d.dept_id in
-                    <foreach item="item" collection="dsDeptIds" separator="," open="(" close=")" index="">
-                        #{item}
-                    </foreach>
-                </if>
-            </trim>
-        </if>
         order by d.parent_id, d.order_num
     </select>