Commit 4c7f9111 by liyanlin

修复打板互通了所有品牌的问题。

parent 68eb68c5
...@@ -45,7 +45,7 @@ public interface CareerCmdService { ...@@ -45,7 +45,7 @@ public interface CareerCmdService {
* @param pageSize * @param pageSize
* @return * @return
*/ */
Page<BaseProduce> queryWorkTpl(Integer technicianId, Integer pageNum, Integer pageSize, String searchKeyWord); Page<BaseProduce> queryWorkTpl(Integer technicianId, Integer pageNum, Integer pageSize, String searchKeyWord,Integer brandId);
} }
...@@ -137,10 +137,10 @@ public class CareerCmdServiceImpl implements CareerCmdService { ...@@ -137,10 +137,10 @@ public class CareerCmdServiceImpl implements CareerCmdService {
} }
@Override @Override
public Page<BaseProduce> queryWorkTpl(Integer technicianId, Integer pageNum, Integer pageSize, String searchKeyWord) { public Page<BaseProduce> queryWorkTpl(Integer technicianId, Integer pageNum, Integer pageSize, String searchKeyWord,Integer brandId) {
Page<BaseProduce> baseProducePage = new Page<>(pageNum, pageSize); Page<BaseProduce> baseProducePage = new Page<>(pageNum, pageSize);
baseProducePage = careerMapper.queryWorkTpl(baseProducePage, technicianId, searchKeyWord); baseProducePage = careerMapper.queryWorkTpl(baseProducePage, technicianId, searchKeyWord, brandId);
List<PurchaseSku> purchaseSkuList = purchaseSkuMapper.listByProduceIds(baseProducePage.getRecords().stream().map(BaseProduce::getId).collect(Collectors.toList())); List<PurchaseSku> purchaseSkuList = purchaseSkuMapper.listByProduceIds(baseProducePage.getRecords().stream().map(BaseProduce::getId).collect(Collectors.toList()));
......
...@@ -109,5 +109,6 @@ public interface CareerMapper extends BaseMapper<Career> { ...@@ -109,5 +109,6 @@ public interface CareerMapper extends BaseMapper<Career> {
*/ */
Page<BaseProduce> queryWorkTpl(@Param("page") Page<BaseProduce> baseProducePage, Page<BaseProduce> queryWorkTpl(@Param("page") Page<BaseProduce> baseProducePage,
@Param("technicianId") Integer technicianId, @Param("technicianId") Integer technicianId,
@Param("searchKeyWord") String searchKeyWord); @Param("searchKeyWord") String searchKeyWord,
@Param("brandId") Integer brandId);
} }
...@@ -53,9 +53,10 @@ public class CareerWorksController { ...@@ -53,9 +53,10 @@ public class CareerWorksController {
@GetMapping("/technician/career/queryWorkTpl") @GetMapping("/technician/career/queryWorkTpl")
public JsonResult<Page<BaseProduce>> queryWorkTpl(@RequestParam Integer pageNum, public JsonResult<Page<BaseProduce>> queryWorkTpl(@RequestParam Integer pageNum,
@RequestParam Integer pageSize, @RequestParam Integer pageSize,
@RequestParam(required = false) String searchKeyWord) { @RequestParam(required = false) String searchKeyWord,
@RequestHeader("brandId") Integer brandId) {
Integer technicianId = SessionUtils.getTechnicianId(); Integer technicianId = SessionUtils.getTechnicianId();
Page<BaseProduce> baseProduceList = careerCmdService.queryWorkTpl(technicianId, pageNum, pageSize, searchKeyWord); Page<BaseProduce> baseProduceList = careerCmdService.queryWorkTpl(technicianId, pageNum, pageSize, searchKeyWord, brandId);
return JsonResult.success(baseProduceList); return JsonResult.success(baseProduceList);
} }
......
...@@ -116,6 +116,7 @@ ...@@ -116,6 +116,7 @@
and t1.`name` like concat('%',#{searchKeyWord},'%') and t1.`name` like concat('%',#{searchKeyWord},'%')
</if> </if>
and t2.id is null and t2.id is null
and t1.brand_id = #{brandId}
order by t1.update_time desc order by t1.update_time desc
</select> </select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment