修改代码

pz-admin/src/main/java/com/pz/web/controller/system/DataViewController.java

@@ -10,6 +10,8 @@ import com.pz.common.core.domain.R;
 import com.pz.common.core.domain.dto.RoleDTO;
 import com.pz.common.core.domain.dto.RoleDTO;
 import com.pz.common.core.domain.model.LoginUser;
 import com.pz.common.core.domain.model.LoginUser;
 import com.pz.common.core.page.TableDataInfo;
 import com.pz.common.core.page.TableDataInfo;
+import com.pz.merchant.domain.bo.CompanyBo;
+import com.pz.merchant.domain.vo.CompanyVo;
 import com.pz.system.domain.bo.DbghOrderBo;
 import com.pz.system.domain.bo.DbghOrderBo;
 import com.pz.system.domain.bo.OrderColumnarBo;
 import com.pz.system.domain.bo.OrderColumnarBo;
 import com.pz.system.domain.vo.DbghOrderVo;
 import com.pz.system.domain.vo.DbghOrderVo;
@@ -61,6 +63,7 @@ public class DataViewController extends BaseController {
 
 
     private final IStoreApplyService iStoreApplyService;
     private final IStoreApplyService iStoreApplyService;
 
 
+
     /**
     /**
      * 新增用户统计
      * 新增用户统计
      */
      */
@@ -75,7 +78,7 @@ public class DataViewController extends BaseController {
     @GetMapping("/dataEmployees")
     @GetMapping("/dataEmployees")
     public R<DataViewVo> dataEmployees(DataViewBo dataViewBo) {
     public R<DataViewVo> dataEmployees(DataViewBo dataViewBo) {
         Long roleId = getLoginUser().getRoleId();
         Long roleId = getLoginUser().getRoleId();
-        if(null != roleId && roleId == 3){
+        if (null != roleId && roleId == 3) {
             dataViewBo.setUserId(getUserId());
             dataViewBo.setUserId(getUserId());
         }
         }
         return R.ok(iEmployeesService.dataEmployees(dataViewBo));
         return R.ok(iEmployeesService.dataEmployees(dataViewBo));
@@ -111,7 +114,7 @@ public class DataViewController extends BaseController {
     @GetMapping("/platformRevenue")
     @GetMapping("/platformRevenue")
     public R<DataOrderVo> platformRevenue(DataViewBo dataViewBo) {
     public R<DataOrderVo> platformRevenue(DataViewBo dataViewBo) {
         Long roleId = getLoginUser().getRoleId();
         Long roleId = getLoginUser().getRoleId();
-        if(null != roleId && roleId == 3){
+        if (null != roleId && roleId == 3) {
             dataViewBo.setUserId(getUserId());
             dataViewBo.setUserId(getUserId());
         }
         }
         return R.ok(iTotalOrderService.platformRevenue(dataViewBo));
         return R.ok(iTotalOrderService.platformRevenue(dataViewBo));
@@ -123,7 +126,7 @@ public class DataViewController extends BaseController {
     @GetMapping("/orderQuantity")
     @GetMapping("/orderQuantity")
     public R<DataViewVo> orderQuantity(DataViewBo dataViewBo) {
     public R<DataViewVo> orderQuantity(DataViewBo dataViewBo) {
         Long roleId = getLoginUser().getRoleId();
         Long roleId = getLoginUser().getRoleId();
-        if(null != roleId && roleId == 3){
+        if (null != roleId && roleId == 3) {
             dataViewBo.setUserId(getUserId());
             dataViewBo.setUserId(getUserId());
         }
         }
         DataOrderVo dataOrderVo = iTotalOrderService.orderQuantity(dataViewBo);
         DataOrderVo dataOrderVo = iTotalOrderService.orderQuantity(dataViewBo);
@@ -140,4 +143,14 @@ public class DataViewController extends BaseController {
         OrderColumnarBo bo) {
         OrderColumnarBo bo) {
         return R.ok(iTotalOrderService.findOrderColumnarVoList(bo));
         return R.ok(iTotalOrderService.findOrderColumnarVoList(bo));
     }
     }
+
+
+    /**
+     * 机构列表
+     */
+    @GetMapping("/companyList")
+    public R<List<CompanyVo>> companyList(
+        CompanyBo bo) {
+        return R.ok(iCompanyService.queryList(bo));
+    }
 }
 }

pz-system/src/main/java/com/pz/merchant/service/impl/CompanyServiceImpl.java

@@ -119,6 +119,7 @@ public class CompanyServiceImpl implements ICompanyService {
         LambdaQueryWrapper<Company> lqw = Wrappers.lambdaQuery();
         LambdaQueryWrapper<Company> lqw = Wrappers.lambdaQuery();
         lqw.eq(null != bo.getStatus(), Company::getStatus,1);
         lqw.eq(null != bo.getStatus(), Company::getStatus,1);
         lqw.eq(null != bo.getUid(), Company::getUid,bo.getUid());
         lqw.eq(null != bo.getUid(), Company::getUid,bo.getUid());
+        lqw.eq(null != bo.getCityId(),Company::getCityId,bo.getCityId());
         lqw.like(StringUtils.isNotBlank(bo.getName()), Company::getName, bo.getName());
         lqw.like(StringUtils.isNotBlank(bo.getName()), Company::getName, bo.getName());
         return lqw;
         return lqw;
     }
     }

pz-system/src/main/java/com/pz/system/service/impl/TotalOrderServiceImpl.java

@@ -1278,6 +1278,8 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
             if (CollectionUtils.isNotEmpty(companies)) {
             if (CollectionUtils.isNotEmpty(companies)) {
                 List<Employees> employees = employeesMapper.selectList(Wrappers.<Employees>lambdaQuery().in(Employees::getCompanyId, companies.stream().map(Company::getId).collect(Collectors.toList())));
                 List<Employees> employees = employeesMapper.selectList(Wrappers.<Employees>lambdaQuery().in(Employees::getCompanyId, companies.stream().map(Company::getId).collect(Collectors.toList())));
                 bo.setEmIds(CollectionUtils.isNotEmpty(employees) ? employees.stream().map(Employees::getId).collect(Collectors.toList()) : Arrays.asList(999999));
                 bo.setEmIds(CollectionUtils.isNotEmpty(employees) ? employees.stream().map(Employees::getId).collect(Collectors.toList()) : Arrays.asList(999999));
+            } else {
+                bo.setEmIds(Arrays.asList(999999));
             }
             }
         }
         }