优化查询sql，避免索引失效问题2

fs-service/src/main/resources/mapper/his/FsUserMapper.xml

@@ -734,9 +734,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 --             and (fs_user_company_user.company_user_id = #{userId} OR company_user.parent_id = #{userId} )
             and fs_user_company_user.company_user_id = #{userId}
         </if>
-        <if test="companyId != null ">
-            and fs_user_company_user.company_id = #{companyId}
-        </if>
+        AND fs_user_company_user.company_id =
+        CASE
+        WHEN #{companyId} IS NOT NULL THEN #{companyId}
+        ELSE fs_user_company_user.company_id
+        END
         GROUP BY
         fs_user_company_user.`status`,fs_user_company_user.project_id
     </select>

fs-service/src/main/resources/mapper/hisStore/FsUserScrmMapper.xml

@@ -776,9 +776,11 @@
 --             and (fs_user_company_user.company_user_id = #{userId} OR company_user.parent_id = #{userId} )
             and fs_user_company_user.company_user_id = #{userId}
         </if>
-        <if test="companyId != null ">
-            and fs_user_company_user.company_id = #{companyId}
-        </if>
+        AND fs_user_company_user.company_id =
+        CASE
+        WHEN #{companyId} IS NOT NULL THEN #{companyId}
+        ELSE fs_user_company_user.company_id
+        END
         GROUP BY
         fs_user_company_user.`status`,fs_user_company_user.project_id
     </select>