Merge remote-tracking branch 'upstream/master'

fungleo

2020-08-04 107672419e484d7893ecf624d4af2101cc72d890

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

@@ -77,8 +77,7 @@
   

   <select id="checkDeptNameUnique" resultMap="SysDeptResult">

       <include refid="selectDeptVo"/>

      where dept_name=#{deptName} and parent_id = #{parentId}

              limit 1

      where dept_name=#{deptName} and parent_id = #{parentId} limit 1

   </select>

    

    <insert id="insertDept" parameterType="SysDept">