Merge branch 'dev_1.1.1' into dev_1.1.2

merge

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

@@ -84,6 +84,13 @@
                                             <when test="dpr.hasRegionCoordinator">
                                                 AND c.region_coordinator_id = #{dpr.requestUserId}
                                             </when>
+                                            <otherwise>
+                                                <choose>
+                                                    <when test="dpr.hasAccountManager">
+                                                        AND c.crm_user_id = #{dpr.requestUserId}
+                                                    </when>
+                                                </choose>
+                                            </otherwise>
                                         </choose>
                                     </otherwise>
                                 </choose>

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

@@ -79,6 +79,13 @@
                                             <when test="dpr.hasRegionCoordinator">
                                                 AND c.region_coordinator_id = #{dpr.requestUserId}
                                             </when>
+                                            <otherwise>
+                                                <choose>
+                                                    <when test="dpr.hasAccountManager">
+                                                        AND c.crm_user_id = #{dpr.requestUserId}
+                                                    </when>
+                                                </choose>
+                                            </otherwise>
                                         </choose>
                                     </otherwise>
                                 </choose>