浏览代码

去除无用代码

yangzian 3 年之前
父节点
当前提交
ba337ee8df

+ 6 - 3
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/controller/SettlementFileController.java

@@ -53,13 +53,16 @@ public class SettlementFileController {
         //管理员 || 财务
         //管理员 || 财务
         if ("admin".equals(roleCode) || "finance".equals(roleCode)){
         if ("admin".equals(roleCode) || "finance".equals(roleCode)){
             paramsVo.setSaleUserIds(new HashSet<>(userIds));
             paramsVo.setSaleUserIds(new HashSet<>(userIds));
+            paramsVo.setCreateUserId(null);
         }else {
         }else {
             //查询 销售及助理 关联对应的人员
             //查询 销售及助理 关联对应的人员
-            userIds = cwjsSaleAssistantInfoService.getCwSaleAndAssistantListStr(paramsVo.getCreateUserId());
+          /*  userIds = cwjsSaleAssistantInfoService.getCwSaleAndAssistantListStr(paramsVo.getCreateUserId());
             if (Check.isNull(userIds)){
             if (Check.isNull(userIds)){
                 userIds.add(paramsVo.getCreateUserId());
                 userIds.add(paramsVo.getCreateUserId());
-            }
-            paramsVo.setSaleUserIds(new HashSet<>(userIds));
+            }*/
+            //查询所有包含自己的下级
+            Set<String> operatorUserIds= materialReportOverViewService.recursiveQuerySubordinate(paramsVo.getCreateUserId());
+            paramsVo.setSaleUserIds(operatorUserIds);
         }
         }
        return settlementFileInfoService.getSettlementSheetList(paramsVo,pageNo,pageSize);
        return settlementFileInfoService.getSettlementSheetList(paramsVo,pageNo,pageSize);
     }
     }

+ 3 - 18
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/mapper/xml/SettlementFileInfoMapper.xml

@@ -142,22 +142,7 @@
             <if test="createUserName !=null and createUserName != ''">
             <if test="createUserName !=null and createUserName != ''">
                 AND operateUserId like concat ('%',#{createUserName},'%')
                 AND operateUserId like concat ('%',#{createUserName},'%')
             </if>
             </if>
-            <!--
-            <if test="operatorUserIds !=null and operatorUserIds.size() >0 ">
-                AND operateUserId in
-                <foreach collection="operatorUserIds" item="item" separator=","
-                         open="(" close=")">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="saleUserIds !=null and saleUserIds.size() > 0">
-                AND saleUserId in
-                <foreach collection="saleUserIds" item="item" separator=","
-                         open="(" close=")">
-                    #{item}
-                </foreach>
-            </if>
-        -->
+
             <if test="saleUserIds !=null and saleUserIds.size() >0 ">
             <if test="saleUserIds !=null and saleUserIds.size() >0 ">
                 AND (operateUserId in
                 AND (operateUserId in
                 <foreach collection="saleUserIds" item="item" separator=","
                 <foreach collection="saleUserIds" item="item" separator=","
@@ -171,9 +156,9 @@
                 </foreach>
                 </foreach>
                 )
                 )
             </if>
             </if>
-            <if test="createUserId !=null and createUserId != ''">
+           <!-- <if test="createUserId !=null and createUserId != ''">
                 AND (operateUserId = #{createUserId} or saleUserId = #{createUserId})
                 AND (operateUserId = #{createUserId} or saleUserId = #{createUserId})
-            </if>
+            </if>-->
         </where>
         </where>
         ORDER BY t.update_time DESC,t.projectId
         ORDER BY t.update_time DESC,t.projectId
     </select>
     </select>