|
@@ -301,7 +301,7 @@ public class ProductionWorkstopPlanServiceImpl extends ServiceImpl<ProductionWor
|
|
|
public List<ProductionLocationVo> listLocation(ProductionVoParam voParam) {
|
|
public List<ProductionLocationVo> listLocation(ProductionVoParam voParam) {
|
|
|
String orgId = voParam.getOrgId();
|
|
String orgId = voParam.getOrgId();
|
|
|
QueryWrapper<ProductionWorkstopPlan> queryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<ProductionWorkstopPlan> queryWrapper = new QueryWrapper<>();
|
|
|
- queryWrapper.eq(StringUtils.isNotBlank(orgId), "org_id", orgId).groupBy("location_name");
|
|
|
|
|
|
|
+ queryWrapper.eq(StringUtils.isNotBlank(orgId), "org_id", orgId).groupBy("location_id");
|
|
|
List<ProductionWorkstopPlan> workstopPlans = planMapper.selectList(queryWrapper);
|
|
List<ProductionWorkstopPlan> workstopPlans = planMapper.selectList(queryWrapper);
|
|
|
List<ProductionLocationVo> list = new ArrayList<>();
|
|
List<ProductionLocationVo> list = new ArrayList<>();
|
|
|
for (ProductionWorkstopPlan workstopPlan : workstopPlans) {
|
|
for (ProductionWorkstopPlan workstopPlan : workstopPlans) {
|
