2
2

2 コミット be2e2832b1 ... 363c24b593

作者 SHA1 メッセージ 日付
  jiequan.bi 363c24b593 Merge remote-tracking branch 'origin/V1.1.6' into V1.1.6 4 年 前
  jiequan.bi 91198cca4e release of '批量派单' on 2021.3.24 4 年 前

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/MaterialReportOverViewServiceImpl.java

@@ -287,7 +287,7 @@ public class MaterialReportOverViewServiceImpl implements IMaterialReportOverVie
     public PageInfo<JSONObject> getTopDesignList(String startDate, String endDate, String userId, String target, String order, int pageSize, int pageNo) {
     public PageInfo<JSONObject> getTopDesignList(String startDate, String endDate, String userId, String target, String order, int pageSize, int pageNo) {
         PageInfo<JSONObject> result = new PageInfo<>();
         PageInfo<JSONObject> result = new PageInfo<>();
         Set<String> subordinate = this.recursiveQuerySubordinate(userId);
         Set<String> subordinate = this.recursiveQuerySubordinate(userId);
-        if (subordinate.isEmpty()) {
+        if (subordinate.size()==1) {
             subordinate = materialReportOverViewMapper.recursiveQuerySubordinateByUserId(userId);
             subordinate = materialReportOverViewMapper.recursiveQuerySubordinateByUserId(userId);
         }
         }
         PageHelper.startPage(pageNo, pageSize, false);
         PageHelper.startPage(pageNo, pageSize, false);