Merge remote-tracking branch 'origin/dev_1.1.1' into dev_1.1.1

sop-business/src/main/resources/mapper/TBSopInfoMapper.xml

@@ -165,10 +165,15 @@
                                                     </when>
                                                     <otherwise>
                                                         <choose>
-                                                            <when test="dpr.hasEffectEngineer or dpr.hasAssistantEngineer">
+                                                            <when test="!dpr.hasAccountManager and (dpr.hasEffectEngineer or dpr.hasAssistantEngineer)">
                                                                 AND EXISTS(SELECT 1 FROM t_b_user_archives_allocation tbuaa WHERE tbuaa.crm_detail_id = tbcd.id AND tbuaa.user_id = #{dpr.requestUserId} and tbuaa.sop_role_type = 'ENGINEER')
                                                             </when>
                                                         </choose>
+                                                        <choose>
+                                                            <when test="dpr.hasAccountManager">
+                                                                AND tbc.crm_user_id = #{dpr.requestUserId}
+                                                            </when>
+                                                        </choose>
                                                     </otherwise>
                                                 </choose>
                                             </otherwise>