Merge branch 'feature_asset'

mitao

2 天以前 ab0ad84b5c577036f9ed5b53d2e90e81e5ba3de9

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

@@ -86,7 +86,22 @@
       <include refid="selectDeptVo"/>
      where dept_name=#{deptName} and parent_id = #{parentId} and del_flag = '0' limit 1
   </select>
    

    <select id="selectByIds" resultType="com.ruoyi.common.core.domain.entity.SysDept"
            parameterType="java.util.List">
      select * from sys_dept
      <where>
         del_flag = '0'
         <if test="deptIds !=null and deptIds.size() != 0">
            and dept_id in
            <foreach collection="deptIds" item="item" open="(" separator="," close=")">
               #{item}
            </foreach>
         </if>
      </where>
      order by id desc
   </select>

    <insert id="insertDept" parameterType="SysDept">
       insert into sys_dept(
          <if test="deptId != null and deptId != 0">dept_id,</if>