diff --git a/epdc-cloud-optimize-department/src/main/resources/mapper/macode/OptDeptMaCodeDao.xml b/epdc-cloud-optimize-department/src/main/resources/mapper/macode/OptDeptMaCodeDao.xml
index 6f592a9..1b0e498 100644
--- a/epdc-cloud-optimize-department/src/main/resources/mapper/macode/OptDeptMaCodeDao.xml
+++ b/epdc-cloud-optimize-department/src/main/resources/mapper/macode/OptDeptMaCodeDao.xml
@@ -35,15 +35,24 @@
             resultType="com.elink.esua.epdc.optimize.modules.macode.dto.OptDeptMaCodeDTO">
         select * from epdc_dept_ma_code_copy1 ma
         where  ma.del_flag = '0'
-        <if test="gridId != null and gridId != ''">
-            and ma.grid_id = #{gridId}
-        </if>
-        <if test="leaderFlag != null and leaderFlag != ''">
-            and ma.leader_flag = #{leaderFlag}
-        </if>
-        <if test='(dataScopeDeptIds != null and  dataScopeDeptIds.size() > 0) and leaderFlag == "0"'>
-            AND ma.grid_id IN <foreach collection="dataScopeDeptIds" open="(" separator="," close=")" item="deptId">#{deptId}</foreach>
-        </if>
+        <choose>
+            <when test='leaderFlag != null and leaderFlag != "" and leaderFlag == "1"'>and ma.leader_flag = '1'</when>
+            <otherwise>
+                and ma.leader_flag = '0'
+                <if test="gridId != null and gridId != ''">
+                    and ma.grid_id = #{gridId}
+                </if>
+                <if test="communityId != null and communityId != ''">
+                    and ma.all_dept_ids like '%${communityId}%'
+                </if>
+                <if test="streetId != null and streetId != ''">
+                    and ma.all_dept_ids like '%${streetId}%'
+                </if>
+                <if test='dataScopeDeptIds != null and  dataScopeDeptIds.size() > 0'>
+                    AND ma.grid_id IN <foreach collection="dataScopeDeptIds" open="(" separator="," close=")" item="deptId">#{deptId}</foreach>
+                </if>
+            </otherwise>
+        </choose>
     </select>