Merge remote-tracking branch 'origin/master'

jiangping

2024-12-11 eb49564ab17c6695d8928d5a63a57c58b3cfd79c

 server/system_service/src/main/resources/mappers/SystemUserMapper.xml

@@ -75,6 +75,9 @@
      <if test="dto.companyType != null ">
        AND  sd.`type` = #{dto.companyType}
      </if>
      <if test="dto.querySpecial != null and dto.querySpecial == 1 ">
            AND find_in_set(#{dto.companySpecialId},REPLACE(sd.company_path,'/',','))
      </if>
    </where>
    ${orderByClause}
  </select>