From 54cce185f383849322d5cc309d2ee5d155d15915 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 15 十一月 2023 18:57:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
mes-basic/src/main/java/com/chinaztt/mes/basic/controller/DivisionController.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/DivisionController.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/DivisionController.java
index ce99c57..3105705 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/DivisionController.java
+++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/DivisionController.java
@@ -18,6 +18,7 @@
package com.chinaztt.mes.basic.controller;
import com.alibaba.excel.EasyExcel;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.chinaztt.mes.basic.entity.Division;
@@ -166,7 +167,8 @@
@PostMapping("/adddivision")
@PreAuthorize("@pms.hasPermission('basic_division_add')")
public R addDivision(@RequestBody Division division) {
- if (division.getId().equals(0L)) {
+ System.err.println("=========================================================================銆�"+division);
+ if (division.getId().equals(0L)) {
//鍒ゆ柇缂栧彿鏄惁閲嶅
Division divisionByFind=divisionService.getOne(Wrappers.<Division>lambdaQuery().eq(Division::getDivisionNo, division.getDivisionNo()));
if(divisionByFind!=null){
@@ -181,4 +183,11 @@
}
+ @GetMapping("/getDivisionByFactoryId")
+ public R getDivisionByFactoryId(Long id,Long factoryId){
+ QueryWrapper<Division> queryWrapper = new QueryWrapper<>();
+ queryWrapper.lambda().eq(Division::getFactoryId,factoryId).eq(Division::getCompanyId,id);
+ return R.ok(divisionService.getBaseMapper().selectList(queryWrapper));
+ }
+
}
--
Gitblit v1.9.3