fix. sop列表查询数据权限更改

sop-business/src/main/java/com/qmth/sop/business/service/impl/SysUserServiceImpl.java

@@ -601,27 +601,18 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         dto.setHasPmo(roleTypeList.contains(RoleTypeEnum.PMO));
         dto.setHasBusiness(roleTypeList.contains(RoleTypeEnum.BUSSINESS));
         dto.setHasRegionManager(roleTypeList.contains(RoleTypeEnum.REGION_MANAGER));
-        //        dto.setHasRegionCoordinator(roleTypeList.contains(RoleTypeEnum.REGION_COORDINATOR));
-        int count = tbUserArchivesAllocationService.count(new QueryWrapper<TBUserArchivesAllocation>().lambda()
-                .eq(TBUserArchivesAllocation::getSopRoleType, SopRoleTypeEnum.REGION_COORDINATOR)
-                .eq(TBUserArchivesAllocation::getUserId, userId));
-        dto.setHasRegionCoordinator(count > 0 ? true : false);
-        //        dto.setHasEffectEngineer(roleTypeList.contains(RoleTypeEnum.EFFECT_ENGINEER));
-        //        dto.setHasAssistantEngineer(roleTypeList.contains(RoleTypeEnum.ASSISTANT_ENGINEER));
-        count = tbUserArchivesAllocationService.count(new QueryWrapper<TBUserArchivesAllocation>().lambda()
-                .eq(TBUserArchivesAllocation::getSopRoleType, SopRoleTypeEnum.ENGINEER)
-                .eq(TBUserArchivesAllocation::getUserId, userId));
-        dto.setHasEffectEngineer(count > 0 ? true : false);
-        dto.setHasAssistantEngineer(count > 0 ? true : false);
+        dto.setHasRegionCoordinator(roleTypeList.contains(RoleTypeEnum.REGION_COORDINATOR));
+        dto.setHasEffectEngineer(roleTypeList.contains(RoleTypeEnum.EFFECT_ENGINEER));
+        dto.setHasAssistantEngineer(roleTypeList.contains(RoleTypeEnum.ASSISTANT_ENGINEER));
         dto.setHasQA(roleTypeList.contains(RoleTypeEnum.QA));
         dto.setHasCustom(roleTypeList.contains(RoleTypeEnum.CUSTOM));
         dto.setHasAccountManager(roleTypeList.contains(RoleTypeEnum.ACCOUNT_MANAGER));
         dto.setHasThirdPmo(roleTypeList.contains(RoleTypeEnum.THIRD_PMO));
         dto.setHasDeviceDelivery(roleTypeList.contains(RoleTypeEnum.DEVICE_DELIVERY));
-        count = tbUserArchivesAllocationService.count(new QueryWrapper<TBUserArchivesAllocation>().lambda()
+        int count = tbUserArchivesAllocationService.count(new QueryWrapper<TBUserArchivesAllocation>().lambda()
                 .eq(TBUserArchivesAllocation::getSopRoleType, SopRoleTypeEnum.PROJECT_MANAGER)
                 .eq(TBUserArchivesAllocation::getUserId, userId));
-        dto.setHasProjectManager(count > 0 ? true : false);
+        dto.setHasProjectManager(count > 0);
 
         if (!dto.getHasProjectManager() && !dto.getHasRegionManager() && !dto.getHasAssistantEngineer()
                 && !dto.getHasAssistantEngineer()) {

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

@@ -90,18 +90,19 @@
                                         AND EXISTS(SELECT 1 FROM t_b_crm tbc WHERE tbs.id = tbc.service_id AND tbc.lead_id = #{dpr.requestUserId})
                                     </when>
                                     <otherwise>
-                                        <choose>
-                                            <when test="dpr.hasRegionCoordinator">
-                                                AND EXISTS(SELECT 1 FROM t_b_crm tbc WHERE tbs.id = tbc.service_id AND tbc.region_coordinator_id = #{dpr.requestUserId})
-                                            </when>
-                                            <otherwise>
-                                                <choose>
-                                                    <when test="dpr.hasEffectEngineer or dpr.hasAssistantEngineer">
-                                                        AND EXISTS(SELECT 1 FROM t_b_user_archives_allocation tbuaa WHERE tbuaa.service_id = tbs.id AND tbuaa.user_id = #{dpr.requestUserId})
-                                                    </when>
-                                                </choose>
-                                            </otherwise>
-                                        </choose>
+                                        AND EXISTS(SELECT 1 FROM t_b_user_archives_allocation tbuaa WHERE tbuaa.service_id = tbs.id AND tbuaa.user_id = #{dpr.requestUserId})
+<!--                                        <choose>-->
+<!--                                            <when test="dpr.hasRegionCoordinator">-->
+<!--                                                AND EXISTS(SELECT 1 FROM t_b_user_archives_allocation tbuaa WHERE tbuaa.service_id = tbs.id AND tbuaa.user_id = #{dpr.requestUserId})-->
+<!--                                            </when>-->
+<!--                                            <otherwise>-->
+<!--                                                <choose>-->
+<!--                                                    <when test="dpr.hasEffectEngineer or dpr.hasAssistantEngineer">-->
+<!--                                                        AND EXISTS(SELECT 1 FROM t_b_user_archives_allocation tbuaa WHERE tbuaa.service_id = tbs.id AND tbuaa.user_id = #{dpr.requestUserId})-->
+<!--                                                    </when>-->
+<!--                                                </choose>-->
+<!--                                            </otherwise>-->
+<!--                                        </choose>-->
                                     </otherwise>
                                 </choose>
                             </otherwise>

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

@@ -155,27 +155,11 @@
                                     </when>
                                     <otherwise>
                                         <choose>
-                                            <when test="dpr.hasProjectManager">
-                                                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 = 'PROJECT_MANAGER')
+                                            <when test="dpr.hasAccountManager">
+                                                AND tbc.crm_user_id = #{dpr.requestUserId}
                                             </when>
                                             <otherwise>
-                                                <choose>
-                                                    <when test="dpr.hasRegionCoordinator">
-                                                        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 = 'REGION_COORDINATOR')
-                                                    </when>
-                                                    <otherwise>
-                                                        <choose>
-                                                            <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>
+                                                AND EXISTS(SELECT 1 FROM t_b_user_archives_allocation tbuaa WHERE tbuaa.crm_detail_id = tbcd.id AND tbuaa.user_id = #{dpr.requestUserId})
                                             </otherwise>
                                         </choose>
                                     </otherwise>