供应商列表、店铺列表

ruoyi-admin/src/main/java/com/ruoyi/web/controller/clock/EmployeeController.java

@@ -77,7 +77,7 @@ public class EmployeeController extends BaseController {
             employeeVo.loadAgentVo();
             employeeVo.loadShopVo();
         }
-        return R.ok();
+        return R.ok(employeeVo);
     }
 
     /**

ruoyi-system/src/main/java/com/ruoyi/clock/service/impl/EmployeeServiceImpl.java

@@ -69,6 +69,7 @@ public class EmployeeServiceImpl implements IEmployeeService {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<Employee> lqw = Wrappers.lambdaQuery();
         lqw.like(StringUtils.isNotBlank(bo.getEmployeeName()), Employee::getEmployeeName, bo.getEmployeeName());
+        lqw.eq(bo.getAgentId() != null, Employee::getAgentId, bo.getAgentId());
         lqw.eq(bo.getShopId() != null, Employee::getShopId, bo.getShopId());
         lqw.eq(StringUtils.isNotBlank(bo.getPhonenumber()), Employee::getPhonenumber, bo.getPhonenumber());
         lqw.eq(StringUtils.isNotBlank(bo.getStatus()), Employee::getStatus, bo.getStatus());