Merge remote-tracking branch 'origin/master'

jiangping

2024-12-17 c52a775aeb3386dfab1ac78ac3430ff86934220a

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

@@ -76,7 +76,7 @@
        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,"/",","))
            AND find_in_set(#{dto.companySpecialId},REPLACE(sd.company_path,'/',','))
      </if>
    </where>
    ${orderByClause}