Merge remote-tracking branch 'origin/master'

src/main/java/cn/ezhizao/framework/qrCode/QrCodeService.java

@@ -1,9 +1,5 @@
 package cn.ezhizao.framework.qrCode;
 
-import cn.hutool.core.io.FileUtil;
-import cn.hutool.extra.qrcode.QrCodeException;
-import cn.hutool.extra.qrcode.QrCodeUtil;
-import cn.hutool.extra.qrcode.QrConfig;
 import cn.ezhizao.common.utils.StringUtils;
 import cn.ezhizao.common.utils.WaterMakerUtils;
 import cn.ezhizao.common.utils.bean.ImgWaterMarker;
@@ -12,12 +8,17 @@ import cn.ezhizao.common.utils.bean.WaterMarker;
 import cn.ezhizao.common.utils.file.FileUploadUtils;
 import cn.ezhizao.framework.config.RuoYiConfig;
 import cn.ezhizao.project.tenant.domain.BizTenant;
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.extra.qrcode.QrCodeException;
+import cn.hutool.extra.qrcode.QrCodeUtil;
+import cn.hutool.extra.qrcode.QrConfig;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.awt.*;
+import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -32,6 +33,9 @@ public class QrCodeService {
     @Resource
     private QrConfig config;
 
+    @Resource
+    private QrCoderDemo qrCoder;
+
     @Resource
     private WaterMakerUtils waterMakerUtils;
     /**
@@ -47,6 +51,11 @@ public class QrCodeService {
         }
     }
 
+    public void createNewCodeToFile(String content, String filePath,String footer) {
+        BufferedImage bufferedImage = qrCoder.createQrCode(null, null, content, footer);
+        qrCoder.createImage(bufferedImage, filePath);
+    }
+
     /**
      *
      * @param content

src/main/java/cn/ezhizao/framework/qrCode/QrCoderDemo.java

@@ -0,0 +1,154 @@
+package cn.ezhizao.framework.qrCode;
+
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.extra.qrcode.QrCodeUtil;
+import cn.hutool.extra.qrcode.QrConfig;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+
+import javax.imageio.ImageIO;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.*;
+
+/**
+ * 合成二维码工具类
+ */
+@Service
+@Slf4j
+public class QrCoderDemo {
+
+    /**
+     * 图片的宽度
+     */
+    private static final int IMAGE_WIDTH = 350;
+    /**
+     * 图片的高度(需按实际内容高度进行调整)
+     */
+    private static final int IMAGE_HEIGHT = 350;
+    /**
+     * 二维码的宽度
+     */
+    private static final int QR_CODE_WIDTH = 300;
+    /**
+     * 二维码的宽度
+     */
+    private static final int QR_CODE_HEIGHT = 300;
+
+    private static final String FORMAT_NAME = "JPG";
+
+    /**
+     * @param imgLogo logo图片
+     * @param title   头部标题
+     * @param content 内容
+     * @param footer  底部文字
+     */
+    public static BufferedImage createQrCode(String imgLogo, String title, String content, String footer) {
+//        // 头部文字区域高度
+        int titleHeight = 50;
+
+        // 创建主模板图片
+        BufferedImage image = new BufferedImage(IMAGE_WIDTH, IMAGE_HEIGHT, BufferedImage.TYPE_INT_RGB);
+        Graphics2D main = image.createGraphics();
+        // 设置图片的背景色
+        main.setColor(Color.white); //白色
+        main.fillRect(0, 0, IMAGE_WIDTH, IMAGE_HEIGHT);
+
+        // 动态高度
+        int height = 0;
+//
+//        //***********************页面头部 文字****************
+//        Graphics2D titleRight = image.createGraphics();
+//        // 设置字体颜色 black黑 white白
+//        titleRight.setColor(Color.black);
+//        // 设置字体
+//        Font titleFont = new Font("宋体", Font.BOLD, 25);
+//        titleRight.setFont(titleFont);
+//        titleRight.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_LCD_HRGB);
+//        // 居中 x开始的位置：（图片宽度-字体大小*字的个数）/2
+//        int x = (IMAGE_WIDTH - (titleFont.getSize() * title.length())) / 2;
+//        titleRight.drawString(title, x, (titleHeight) / 2 + 10);
+//        height += titleHeight;
+
+        //**********************中间文字部分*********
+//        Graphics2D centerWord = image.createGraphics();
+//        // 设置字体颜色，先设置颜色，再填充内容
+//        centerWord.setColor(Color.black);
+//        // 设置字体
+//        Font wordFont = new Font("宋体", Font.PLAIN, 15);
+//        centerWord.setFont(wordFont);
+//        centerWord.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_LCD_HRGB);
+//        String[] info = content.split("-");
+//        for (String s : info) {
+//            // x开始的位置：（图片宽度-字体大小*字的个数）/2
+//            int strWidth = centerWord.getFontMetrics().stringWidth(s);
+//            // 总长度减去文字长度的一半  （居中显示）
+//            int startX = (IMAGE_WIDTH - strWidth) / 2;
+//            height += 20;
+//            centerWord.drawString(s, startX, height);
+//        }
+
+        //***************插入二维码图片***********************************************
+        Graphics codePic = image.getGraphics();
+        BufferedImage codeImg;
+        QrConfig config = new QrConfig();
+        config.setWidth(QR_CODE_WIDTH);
+        config.setHeight(QR_CODE_HEIGHT);
+        if (StrUtil.isNotBlank(imgLogo)) {
+            config.setImg(imgLogo);
+        }
+        codeImg = QrCodeUtil.generate(content, config);
+        // 绘制二维码
+        codePic.drawImage(codeImg, (IMAGE_WIDTH - QR_CODE_WIDTH) / 2, height, QR_CODE_WIDTH, QR_CODE_HEIGHT, null);
+        codePic.dispose();
+
+        //**********************底部公司名字*********
+        Graphics2D typeLeft = image.createGraphics();
+        // 设置字体颜色
+        typeLeft.setColor(Color.black);
+        // 设置字体
+        Font footerFont = new Font("宋体", Font.BOLD, 60);
+        typeLeft.setFont(footerFont);
+        typeLeft.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_LCD_HRGB);
+        // x开始的位置：（图片宽度-字体大小*字的个数）/2
+        int startX = 80;
+        height += 340;
+        typeLeft.drawString(footer, startX, height);
+
+        //***************插入标志图片***********************************************
+//        Graphics signPic = image.getGraphics();
+//        BufferedImage signImg = null;
+//        try {
+//            signImg = ImageIO.read(new java.io.File(imgSign));
+//        } catch (Exception e) {
+//        }
+//
+//        if (signImg != null) {
+//            signPic.drawImage(signImg, 0, 130, QR_CODE_WIDTH, QR_CODE_HEIGHT, null);
+//            signPic.dispose();
+//        }
+        // 返回image方便后续处理是生成图片还是生成base64字符串
+        return image;
+    }
+
+    // 生成图片文件
+    public static void createImage(BufferedImage image, String fileLocation) {
+        if (image != null) {
+            try {
+                ImageIO.write(image, "png", new File(fileLocation));
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+
+
+    public static void main(String[] args) {
+        String content = "汇丰管业-HDPE节流式缠绕增强管-DN300-20210101-A001-0821001-080901000001";
+        BufferedImage bufferedImage = createQrCode(null, "物资模块", content, "三峡科技有限公司");
+        createImage(bufferedImage, "D:/test.png");
+    }
+
+}

src/main/java/cn/ezhizao/framework/task/RyTask.java

@@ -65,8 +65,8 @@ public class RyTask
                 qcContent.setType("equipment");
                 content = mapper.writeValueAsString(qcContent);
                 path = uploadPath + "qcCode/equipment/" + qcContent.getEquipmentDetailCode() + ".png";
-                equipment.setQcCode("/upload/qcCode/equipment/" + qcContent.getEquipmentDetailCode() + ".png");
-                qrCodeService.createCodeToFile(content, path);
+                equipment.setQcCode("/profile/upload/qcCode/equipment/" + qcContent.getEquipmentDetailCode() + ".png");
+                qrCodeService.createNewCodeToFile(content, path,qcContent.getEquipmentDetailCode());
                 bizEquipmentDetailService.updateById(equipment);
                 break;
 
@@ -77,8 +77,8 @@ public class RyTask
                 qcContent.setType("carrier");
                 content = mapper.writeValueAsString(qcContent);
                 path = uploadPath + "qcCode/carrier/" + qcContent.getCarrierCode() + ".png";
-                carrier.setQcCode("/upload/qcCode/carrier/" + qcContent.getCarrierCode() + ".png");
-                qrCodeService.createCodeToFile(content, path);
+                carrier.setQcCode("/profile/upload/qcCode/carrier/" + qcContent.getCarrierCode() + ".png");
+                qrCodeService.createNewCodeToFile(content, path,qcContent.getCarrierCode());
                 bizCarrierService.updateById(carrier);
                 break;
 

src/main/java/cn/ezhizao/project/business/carrier/controller/BizCarrierController.java

@@ -48,9 +48,30 @@ public class BizCarrierController extends BaseController {
         if (tenantId != null && !zero.toString().equals(tenantId)) {
            data.setTenantId(Long.valueOf(tenantId));
         }
-
+//        List<String> A = new ArrayList<>();
+//
+//        for (int i = 1; i <= 99999; i++) {
+//            String a = String.format("%06d", i);
+//            A.add(a);
+//        }
+//        List<BizCarrier>carrierList = new ArrayList<>();
+//        // 输出 List A 中的元素
+//        for (String str : A) {
+//            BizCarrier bizCarrier = new BizCarrier();
+//            bizCarrier.setCode(str);
+//           bizCarrier.setCategoryId(2L);
+//           bizCarrier.setTenantId(1L);
+//            carrierList.add(bizCarrier);
+//        }
+//        iBizCarrierService.saveBatch(carrierList);
         startPage();
         List<BizCarrier> list = iBizCarrierService.getList(data);
+        for (BizCarrier item:list
+        ) {
+            if (item.getQcCode().equals("")){
+                task.GenerateQcCode(item);
+            }
+        }
         return getDataTable(list);
     }
 
@@ -72,10 +93,14 @@ public class BizCarrierController extends BaseController {
         if (tenantId != null && !zero.toString().equals(tenantId)) {
             queryWrapper.eq("tenant_id",Long.valueOf(tenantId));
         }
+        queryWrapper.eq("qc_code","");
         List<BizCarrier> list = iBizCarrierService.list(queryWrapper);
         for (BizCarrier item:list
              ) {
-            task.GenerateQcCode(item);
+
+                task.GenerateQcCode(item);
+
+
         }
 
         return success();

src/main/java/cn/ezhizao/project/business/deptUser/controller/BizDeptProcessController.java

@@ -38,8 +38,8 @@ public class BizDeptProcessController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(BizDeptProcess bizDeptProcess) throws NoSuchFieldException, IllegalAccessException
     {
-        final String tenantId = request.getHeader("tenantId");
-        bizDeptProcess.setTenantId(Long.valueOf(tenantId));
+//        final String tenantId = request.getHeader("tenantId");
+//        bizDeptProcess.setTenantId(Long.valueOf(tenantId));
         startPage();
         List<BizDeptProcess> list = bizDeptProcessService.getList(bizDeptProcess);
         return getDataTable(list);
@@ -77,12 +77,12 @@ public class BizDeptProcessController extends BaseController
     @PostMapping("/save")
     public AjaxResult add(@RequestBody List<BizDeptProcess> bizDeptProcess) throws NoSuchFieldException, IllegalAccessException
     {
-        final String tenantId = request.getHeader("tenantId");
+//        final String tenantId = request.getHeader("tenantId");
         for (BizDeptProcess deptProcess : bizDeptProcess
                 ) {
-            deptProcess.setTenantId(Long.valueOf(tenantId));
+//            deptProcess.setTenantId(Long.valueOf(tenantId));
         }
-        List<BizDeptProcess> oldList = bizDeptProcessService.query().eq("dept_id", bizDeptProcess.get(0).getDeptId()).eq("tenant_id", bizDeptProcess.get(0).getTenantId()).list();
+        List<BizDeptProcess> oldList = bizDeptProcessService.query().eq("dept_id", bizDeptProcess.get(0).getDeptId()).list();
         boolean batch = saveOrUpdateBatch(bizDeptProcessService, bizDeptProcess, oldList);
         return toAjax(batch);
     }
@@ -95,8 +95,8 @@ public class BizDeptProcessController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody BizDeptProcess bizDeptProcess) throws NoSuchFieldException, IllegalAccessException
     {
-        final String tenantId = request.getHeader("tenantId");
-        bizDeptProcess.setTenantId(Long.valueOf(tenantId));
+//        final String tenantId = request.getHeader("tenantId");
+//        bizDeptProcess.setTenantId(Long.valueOf(tenantId));
         return toAjax(bizDeptProcessService.updateById(bizDeptProcess));
     }
 

src/main/java/cn/ezhizao/project/business/equipment/controller/BizEquipmentDetailController.java

@@ -65,7 +65,7 @@ public class BizEquipmentDetailController extends BaseController {
      */
     //@PreAuthorize("@ss.hasPermi('business:equipment:list')")
     @PostMapping("/list")
-    public TableDataInfo list(@RequestBody Map<String, Object> data) throws NoSuchFieldException, IllegalAccessException {
+    public TableDataInfo list(@RequestBody Map<String, Object> data) {
         Integer zero = 0;
 //        String tenantId = request.getHeader("tenantId");
         QueryWrapper<BizEquipmentDetail> queryWrapper = new QueryWrapper<>();
@@ -95,11 +95,17 @@ public class BizEquipmentDetailController extends BaseController {
     //@PreAuthorize("@ss.hasPermi('business:equipment:list')")
     @Transactional
     @GetMapping("/detailList")
-    public TableDataInfo detailList( BizEquipmentDetail data) throws NoSuchFieldException, IllegalAccessException {
+    public TableDataInfo detailList( BizEquipmentDetail data) throws NoSuchFieldException, IllegalAccessException, JsonProcessingException {
         final String tenantId = request.getHeader("tenantId");
         data.setTenantId(Long.valueOf(tenantId));
         startPage();
         List<BizEquipmentDetail> list = bizEquipmentDetailService.getDetailsList(data);
+        for (BizEquipmentDetail item:list
+        ) {
+            if (item.getQcCode().equals("")){
+                task.GenerateQcCode(item);
+            }
+        }
         return getDataTable(list);
     }
 

src/main/java/cn/ezhizao/project/business/product/controller/BizProductController.java

@@ -1,27 +1,20 @@
 package cn.ezhizao.project.business.product.controller;
 
-import java.util.List;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import cn.ezhizao.common.utils.poi.ExcelUtil;
 import cn.ezhizao.framework.aspectj.lang.annotation.Log;
 import cn.ezhizao.framework.aspectj.lang.enums.BusinessType;
 import cn.ezhizao.framework.web.controller.BaseController;
 import cn.ezhizao.framework.web.domain.AjaxResult;
 import cn.ezhizao.framework.web.page.TableDataInfo;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import cn.ezhizao.project.business.product.domain.BizProduct;
 import cn.ezhizao.project.business.product.service.IBizProductService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 产品管理Controller

src/main/java/cn/ezhizao/project/business/resourceGroup/controller/BizProductionResourceGroupController.java

@@ -10,6 +10,8 @@ import cn.ezhizao.project.business.resourceGroup.domain.BizProductionResourceGro
 import cn.ezhizao.project.business.resourceGroup.domain.BizProductionResourceGroupDetail;
 import cn.ezhizao.project.business.resourceGroup.service.IBizProductionResourceGroupDetailService;
 import cn.ezhizao.project.business.resourceGroup.service.IBizProductionResourceGroupService;
+import cn.ezhizao.project.system.domain.SysDeptUser;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
@@ -41,6 +43,7 @@ public class BizProductionResourceGroupController extends BaseController
     {
 
         List<BizProductionResourceGroup> list = bizProductionResourceGroupService.getList(bizProductionResourceGroup);
+
         return getDataTable(list);
     }
 
@@ -64,7 +67,8 @@ public class BizProductionResourceGroupController extends BaseController
     {
         BizProductionResourceGroup bizProductionResourceGroup = new BizProductionResourceGroup();
         bizProductionResourceGroup.setId(id);
-        return success(bizProductionResourceGroupService.getList(bizProductionResourceGroup).get(0));
+        List<BizProductionResourceGroup> list = bizProductionResourceGroupService.getList(bizProductionResourceGroup);
+        return success(list.get(0));
     }
 
     /**
@@ -75,11 +79,36 @@ public class BizProductionResourceGroupController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody BizProductionResourceGroup bizProductionResourceGroup) throws NoSuchFieldException, IllegalAccessException
     {
-        bizProductionResourceGroupService.saveOrUpdate(bizProductionResourceGroup);
-        for (BizProductionResourceGroupDetail item: bizProductionResourceGroup.getGroupDetailList()
-             ) {
-            item.setProductionResourceGroupId(bizProductionResourceGroup.getId());
+        if (bizProductionResourceGroup.getId() ==null){
+            List<BizProductionResourceGroup> groupList = bizProductionResourceGroupService.query().eq("dept_id", bizProductionResourceGroup.getDeptId()).eq("code", bizProductionResourceGroup.getCode()).list();
+            if (groupList.size()>0){
+                return error("资源组名称已存在");
+            }
+            bizProductionResourceGroupService.save(bizProductionResourceGroup);
+        }else {
+            List<BizProductionResourceGroup> groupList = bizProductionResourceGroupService.query().eq("dept_id", bizProductionResourceGroup.getDeptId()).eq("code", bizProductionResourceGroup.getCode()).list();
+            if (groupList.size()>1){
+                return error("资源组名称已存在");
+            }
+            bizProductionResourceGroupService.updateById(bizProductionResourceGroup);
         }
+        String msg = "";
+            for (BizProductionResourceGroupDetail item: bizProductionResourceGroup.getGroupDetailList()
+            ) {
+                item.setDeptId(bizProductionResourceGroup.getDeptId());
+                item.setProductionResourceGroupId(bizProductionResourceGroup.getId());
+                //查询非当前资源组下是否该设备已经被绑定了
+                List<BizProductionResourceGroupDetail> equipmentList = bizProductionResourceGroupDetailService.query().ne("production_resource_group_id", bizProductionResourceGroup.getId()).eq("common_type", "equipmentDetail").eq("common_id", item.getCommonId()).list();
+                if (equipmentList.size() > 0){
+                    msg += item.getCommonCode() + ",";
+
+                }
+            }
+            if (!msg.equals("")){
+                throw new RuntimeException(msg + "设备已绑定到其他资源组;");
+            }
+
+
         List<BizProductionResourceGroupDetail> oldList = bizProductionResourceGroupDetailService.query().eq("production_resource_group_id", bizProductionResourceGroup.getId()).list();
         boolean batch = saveOrUpdateBatch(bizProductionResourceGroupDetailService, bizProductionResourceGroup.getGroupDetailList(), oldList);
         return toAjax(batch);
@@ -104,4 +133,5 @@ public class BizProductionResourceGroupController extends BaseController
     {
         return toAjax(bizProductionResourceGroupService.removeById(ids));
     }
+
 }

src/main/java/cn/ezhizao/project/business/resourceGroup/controller/BizProductionResourceGroupDetailController.java

@@ -6,12 +6,16 @@ import cn.ezhizao.framework.aspectj.lang.enums.BusinessType;
 import cn.ezhizao.framework.web.controller.BaseController;
 import cn.ezhizao.framework.web.domain.AjaxResult;
 import cn.ezhizao.framework.web.page.TableDataInfo;
+import cn.ezhizao.project.business.resourceGroup.domain.BizProductionResourceGroup;
 import cn.ezhizao.project.business.resourceGroup.domain.BizProductionResourceGroupDetail;
 import cn.ezhizao.project.business.resourceGroup.service.IBizProductionResourceGroupDetailService;
+import cn.ezhizao.project.system.domain.SysDeptUser;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -22,8 +26,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/business/detail")
-public class BizProductionResourceGroupDetailController extends BaseController
-{
+public class BizProductionResourceGroupDetailController extends BaseController {
     @Resource
     private IBizProductionResourceGroupDetailService bizProductionResourceGroupDetailService;
 
@@ -31,22 +34,26 @@ public class BizProductionResourceGroupDetailController extends BaseController
      * 查询工段资源组明细列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(BizProductionResourceGroupDetail bizProductionResourceGroupDetail) throws NoSuchFieldException, IllegalAccessException
-    {
-        setTenantId(bizProductionResourceGroupDetail);
-        startPage();
+    public TableDataInfo list(BizProductionResourceGroupDetail bizProductionResourceGroupDetail) throws NoSuchFieldException, IllegalAccessException {
         List<BizProductionResourceGroupDetail> list = bizProductionResourceGroupDetailService.getList(bizProductionResourceGroupDetail);
         return getDataTable(list);
     }
 
+    /**
+     * 查询工段资源组明细列表
+     */
+    @GetMapping("/equipmentList")
+    public TableDataInfo EquipmentList(BizProductionResourceGroupDetail bizProductionResourceGroupDetail) throws NoSuchFieldException, IllegalAccessException {
+        List<BizProductionResourceGroupDetail> list = bizProductionResourceGroupDetailService.getEquipmentList(bizProductionResourceGroupDetail);
+        return getDataTable(list);
+    }
+
     /**
      * 导出工段资源组明细列表
      */
     @Log(title = "工段资源组明细", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, BizProductionResourceGroupDetail bizProductionResourceGroupDetail) throws NoSuchFieldException, IllegalAccessException
-    {
-        setTenantId(bizProductionResourceGroupDetail);
+    public void export(HttpServletResponse response, BizProductionResourceGroupDetail bizProductionResourceGroupDetail) throws NoSuchFieldException, IllegalAccessException {
         List<BizProductionResourceGroupDetail> list = bizProductionResourceGroupDetailService.getList(bizProductionResourceGroupDetail);
         ExcelUtil<BizProductionResourceGroupDetail> util = new ExcelUtil<BizProductionResourceGroupDetail>(BizProductionResourceGroupDetail.class);
         util.exportExcel(response, list, "工段资源组明细数据");
@@ -56,8 +63,7 @@ public class BizProductionResourceGroupDetailController extends BaseController
      * 获取工段资源组明细详细信息
      */
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(bizProductionResourceGroupDetailService.getById(id));
     }
 
@@ -66,9 +72,8 @@ public class BizProductionResourceGroupDetailController extends BaseController
      */
     @Log(title = "工段资源组明细", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody BizProductionResourceGroupDetail bizProductionResourceGroupDetail) throws NoSuchFieldException, IllegalAccessException
-    {
-        setTenantId(bizProductionResourceGroupDetail);
+    public AjaxResult add(@RequestBody BizProductionResourceGroupDetail bizProductionResourceGroupDetail) throws NoSuchFieldException, IllegalAccessException {
+
         return toAjax(bizProductionResourceGroupDetailService.save(bizProductionResourceGroupDetail));
     }
 
@@ -77,9 +82,8 @@ public class BizProductionResourceGroupDetailController extends BaseController
      */
     @Log(title = "工段资源组明细", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody BizProductionResourceGroupDetail bizProductionResourceGroupDetail) throws NoSuchFieldException, IllegalAccessException
-    {
-        setTenantId(bizProductionResourceGroupDetail);
+    public AjaxResult edit(@RequestBody BizProductionResourceGroupDetail bizProductionResourceGroupDetail) throws NoSuchFieldException, IllegalAccessException {
+
         return toAjax(bizProductionResourceGroupDetailService.updateById(bizProductionResourceGroupDetail));
     }
 
@@ -87,9 +91,33 @@ public class BizProductionResourceGroupDetailController extends BaseController
      * 删除工段资源组明细
      */
     @Log(title = "工段资源组明细", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long ids) {
         return toAjax(bizProductionResourceGroupDetailService.removeById(ids));
     }
-}
+
+    /**
+     * 删除工段资源组(当删除部门人员时，执行删除操作）
+     */
+    @Log(title = "工段资源组", businessType = BusinessType.DELETE)
+    @PostMapping("/deleteGroupDetail")
+    public AjaxResult deleteGroupDetail(@RequestBody List<SysDeptUser> deptUserList) {
+        QueryWrapper<BizProductionResourceGroupDetail> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("dept_id", deptUserList.get(0).getDeptId());
+        queryWrapper.and(wrapper -> {
+            for (SysDeptUser deptUser : deptUserList) {
+                wrapper.or().eq("common_id", deptUser.getUserId());
+            }
+
+        });
+        List<BizProductionResourceGroupDetail> list = bizProductionResourceGroupDetailService.list(queryWrapper);
+        if(list.size() > 0) {
+            List<Long> ids = new ArrayList<>();
+            for (BizProductionResourceGroupDetail bizProductionResourceGroupDetail : list) {
+                ids.add(bizProductionResourceGroupDetail.getId());
+            }
+            return toAjax(bizProductionResourceGroupDetailService.removeBatchByIds(ids));
+            }
+        return success();
+    }
+}

src/main/java/cn/ezhizao/project/business/resourceGroup/domain/BizProductionResourceGroup.java

@@ -35,5 +35,10 @@ public class BizProductionResourceGroup extends BaseEntity
     private Long deptId;
     @TableField(exist = false)
     private List<BizProductionResourceGroupDetail> groupDetailList ;
-
+    @TableField(exist = false)
+    private List<BizProductionResourceGroupDetail> groupEquipmentList ;
+    @TableField(exist = false)
+    private String nickName;
+    @TableField(exist = false)
+    private String keyWords;
 }

src/main/java/cn/ezhizao/project/business/resourceGroup/domain/BizProductionResourceGroupDetail.java

@@ -1,6 +1,7 @@
 package cn.ezhizao.project.business.resourceGroup.domain;
 
 import cn.ezhizao.framework.web.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -33,8 +34,15 @@ public class BizProductionResourceGroupDetail extends BaseEntity
     private String commonType;
     /** 资源类型 */
     private String commonName;
+
     /** 设备使用部门 */
-    @ApiModelProperty(value = "设备编码")
+    @ApiModelProperty(value = "部门")
     private Long deptId;
+    @TableField(exist = false)
+    private String resourceCode;
+    @TableField(exist = false)
+    private String nickName;
+    @TableField(exist = false)
+    private Long protemDayworkId;
 
 }

src/main/java/cn/ezhizao/project/business/resourceGroup/mapper/BizProductionResourceGroupDetailMapper.java

@@ -22,6 +22,13 @@ public interface BizProductionResourceGroupDetailMapper extends BaseMapper<BizPr
      */
     public List<BizProductionResourceGroupDetail> getList(BizProductionResourceGroupDetail bizProductionResourceGroupDetail);
 
+    /**
+     * 查询工段资源组明细列表
+     *
+     * @param bizProductionResourceGroupDetail 工段资源组明细
+     * @return 工段资源组明细集合
+     */
+    public List<BizProductionResourceGroupDetail> getEquipmentList(BizProductionResourceGroupDetail bizProductionResourceGroupDetail);
     /**
      * 物理删除
      * @param bizProductionResourceGroupDetail

src/main/java/cn/ezhizao/project/business/resourceGroup/service/IBizProductionResourceGroupDetailService.java

@@ -29,4 +29,12 @@ public interface IBizProductionResourceGroupDetailService extends IService<BizPr
      */
     public int physicalDelete(BizProductionResourceGroupDetail bizProductionResourceGroupDetail);
 
+    /**
+     * 查询工段资源组明细列表
+     *
+     * @param bizProductionResourceGroupDetail 工段资源组明细
+     * @return 工段资源组明细集合
+     */
+    public List<BizProductionResourceGroupDetail> getEquipmentList(BizProductionResourceGroupDetail bizProductionResourceGroupDetail);
+
 }

src/main/java/cn/ezhizao/project/business/resourceGroup/service/impl/BizProductionResourceGroupDetailServiceImpl.java

@@ -40,6 +40,13 @@ public class BizProductionResourceGroupDetailServiceImpl  extends ServiceImpl<Bi
      * @return 删除结果
      */
     @Override
-    public int physicalDelete(BizProductionResourceGroupDetail bizProductionResourceGroupDetail){ return bizProductionResourceGroupDetailMapper.physicalDelete(bizProductionResourceGroupDetail); };
+    public int physicalDelete(BizProductionResourceGroupDetail bizProductionResourceGroupDetail){ return bizProductionResourceGroupDetailMapper.physicalDelete(bizProductionResourceGroupDetail); }
+
+    @Override
+    public List<BizProductionResourceGroupDetail> getEquipmentList(BizProductionResourceGroupDetail bizProductionResourceGroupDetail) {
+        return bizProductionResourceGroupDetailMapper.getEquipmentList(bizProductionResourceGroupDetail);
+    }
+
+    ;
 
 }

src/main/java/cn/ezhizao/project/business/technologicalProcessDetail/controller/BizTechnologicalProcessDetailController.java

@@ -41,7 +41,7 @@ public class BizTechnologicalProcessDetailController extends BaseController
     {
 //        String tenantId = request.getHeader("tenantId");
 //        bizTechnologicalProcessDetail.setTenantId(Long.valueOf(tenantId));
-        startPage();
+//        startPage();
         List<BizTechnologicalProcessDetail> list = bizTechnologicalProcessDetailService.getList(bizTechnologicalProcessDetail);
 
         return getDataTable(list);

src/main/java/cn/ezhizao/project/system/controller/SysDeptController.java

@@ -1,6 +1,7 @@
 package cn.ezhizao.project.system.controller;
 
 import cn.ezhizao.common.constant.UserConstants;
+import cn.ezhizao.common.utils.SecurityUtils;
 import cn.ezhizao.common.utils.StringUtils;
 import cn.ezhizao.framework.aspectj.lang.annotation.Log;
 import cn.ezhizao.framework.aspectj.lang.enums.BusinessType;
@@ -8,7 +9,10 @@ import cn.ezhizao.framework.web.controller.BaseController;
 import cn.ezhizao.framework.web.domain.AjaxResult;
 import cn.ezhizao.framework.web.page.TableDataInfo;
 import cn.ezhizao.project.system.domain.SysDept;
+import cn.ezhizao.project.system.domain.SysDeptUser;
 import cn.ezhizao.project.system.service.ISysDeptService;
+import cn.ezhizao.project.system.service.ISysDeptUserService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
@@ -31,6 +35,9 @@ public class SysDeptController extends BaseController
 {
     @Resource
     private ISysDeptService deptService;
+
+    @Resource
+    private ISysDeptUserService deptUserService;
     @Resource
     HttpServletRequest request;
 
@@ -194,11 +201,32 @@ public class SysDeptController extends BaseController
     @GetMapping("/workSectionTree")
     public AjaxResult workSectionTree(SysDept dept) throws NoSuchFieldException, IllegalAccessException {
         String tenantId = request.getHeader("tenantId");
+        Long userId = SecurityUtils.getLoginUser().getUser().getUserId();
         dept.setTenantId(Long.valueOf(tenantId));
         // 未删除
         dept.setDelFlag("0");
         // 施工段
         dept.setIsWorkSection("1");
+        //用于工段查询
+     if (dept.getGetType() == true){
+         QueryWrapper<SysDeptUser> queryWrapper = new QueryWrapper<>();
+         List<Long> ids = new ArrayList<>();
+         queryWrapper.eq("user_id",userId);
+//         queryWrapper.eq("tenant_id",tenantId);
+         queryWrapper.eq("deleted",0);
+         List<SysDeptUser> deptList = deptUserService.list(queryWrapper);
+         for (SysDeptUser deptUser : deptList
+         ) {
+             ids.add(deptUser.getDeptId());
+         }
+         dept.setDeptIds(ids);
+         if (dept.getDeptIds().size() > 0) {
+             return success(deptService.selectDeptTreeList(dept));
+         }
+         else {
+             return success(new SysDept());
+         }
+     }
         return success(deptService.selectDeptTreeList(dept));
     }
 

src/main/java/cn/ezhizao/project/system/domain/SysDept.java

@@ -91,10 +91,22 @@ public class SysDept extends BaseEntity {
      */
     private String role;
 
+    private Boolean getType = false;
+
+    public Boolean getGetType() {
+        return getType;
+    }
+
+    public void setGetType(Boolean getType) {
+        this.getType = getType;
+    }
+
     /**
      * 是否为企业
      */
     private String type;
+
+    private List<Long> deptIds;
     /** 字典标签 */
     @Excel(name = "字典标签")
     @TableField(exist = false)
@@ -263,6 +275,15 @@ public class SysDept extends BaseEntity {
     public void setIsWorkSection(String isWorkSection) {
         this.isWorkSection = isWorkSection;
     }
+
+    public List<Long> getDeptIds() {
+        return deptIds;
+    }
+
+    public void setDeptIds(List<Long> deptIds) {
+        this.deptIds = deptIds;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

src/main/java/cn/ezhizao/project/system/service/ISysDeptService.java

@@ -2,6 +2,7 @@ package cn.ezhizao.project.system.service;
 
 import cn.ezhizao.framework.web.domain.TreeSelect;
 import cn.ezhizao.project.system.domain.SysDept;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
 import java.util.List;
 

src/main/java/cn/ezhizao/project/tenant/controller/BizTenantController.java

@@ -22,10 +22,9 @@ import cn.ezhizao.project.tenant.domain.BizTenant;
 import cn.ezhizao.project.tenant.domain.BizTenantApply;
 import cn.ezhizao.project.tenant.domain.BizUserTenant;
 import cn.ezhizao.project.tenant.service.IBizTenantApplyService;
-import cn.ezhizao.project.tenant.service.IBizUserTenantService;
 import cn.ezhizao.project.tenant.service.IBizTenantService;
+import cn.ezhizao.project.tenant.service.IBizUserTenantService;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
@@ -70,7 +69,7 @@ public class BizTenantController extends BaseController {
     /**
      * 查询企业租户列表
      */
-    @PreAuthorize("@ss.hasPermi('business:tenant:list')")
+//    @PreAuthorize("@ss.hasPermi('business:tenant:list')")
     @GetMapping("/list")
     public TableDataInfo list(BizTenant bizTenant) {
         if (StringUtils.isNotBlank(bizTenant.getOperateType())) {
@@ -81,7 +80,7 @@ public class BizTenantController extends BaseController {
         return getDataTable(list);
     }
 
-    @PreAuthorize("@ss.hasPermi('business:tenant:edit')")
+//    @PreAuthorize("@ss.hasPermi('business:tenant:edit')")
     @GetMapping("/listMyTenant")
     public TableDataInfo list(BizUserTenant userTenant) {
         startPage();
@@ -90,7 +89,7 @@ public class BizTenantController extends BaseController {
         return getDataTable(list);
     }
 
-    @PreAuthorize("@ss.hasPermi('business:tenant:edit')")
+//    @PreAuthorize("@ss.hasPermi('business:tenant:edit')")
     @GetMapping(value = "/exitTenant/{id}")
     public AjaxResult exitTenant(@PathVariable("id") Long id) {
         BizUserTenant userTenant = userTenantService.getById(id);
@@ -111,7 +110,7 @@ public class BizTenantController extends BaseController {
     /**
      * 导出企业租户列表
      */
-    @PreAuthorize("@ss.hasPermi('business:tenant:export')")
+//    @PreAuthorize("@ss.hasPermi('business:tenant:export')")
     @Log(title = "企业租户", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BizTenant bizTenant) {
@@ -123,7 +122,7 @@ public class BizTenantController extends BaseController {
     /**
      * 获取企业租户详细信息
      */
-    @PreAuthorize("@ss.hasPermi('business:tenant:query')")
+//    @PreAuthorize("@ss.hasPermi('business:tenant:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         BizTenant bizTenant = new BizTenant();
@@ -138,7 +137,7 @@ public class BizTenantController extends BaseController {
     /**
      * 新增企业租户
      */
-    @PreAuthorize("@ss.hasPermi('business:tenant:add')")
+//    @PreAuthorize("@ss.hasPermi('business:tenant:add')")
     @Log(title = "企业租户", businessType = BusinessType.INSERT)
     @Transactional(rollbackFor = Exception.class)
     @PostMapping("/save")
@@ -158,7 +157,7 @@ public class BizTenantController extends BaseController {
     /**
      * 修改企业租户
      */
-    @PreAuthorize("@ss.hasPermi('business:tenant:edit')")
+//    @PreAuthorize("@ss.hasPermi('business:tenant:edit')")
     @Log(title = "企业租户", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BizTenant bizTenant) throws NoSuchFieldException, IllegalAccessException {
@@ -168,7 +167,7 @@ public class BizTenantController extends BaseController {
     @Value("${token.expireTime}")
     private int expireTime;
 
-    @PreAuthorize("@ss.hasPermi('business:tenant:edit')")
+//    @PreAuthorize("@ss.hasPermi('business:tenant:edit')")
     @Log(title = "切换租户", businessType = BusinessType.UPDATE)
     @PostMapping("/changeTenant")
     public AjaxResult change(@RequestBody BizTenant bizTenant) {
@@ -186,7 +185,7 @@ public class BizTenantController extends BaseController {
     /**
      * 删除企业租户
      */
-    @PreAuthorize("@ss.hasPermi('business:tenant:remove')")
+//    @PreAuthorize("@ss.hasPermi('business:tenant:remove')")
     @Log(title = "企业租户", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable List<Long> ids) {

src/main/resources/application.yml

@@ -51,8 +51,8 @@ spring:
   cloud:
     nacos:
       discovery:
-#        server-addr: 192.168.10.40:8848 # Nacos服务器地址
-        server-addr: 120.46.159.163:7148 # Nacos服务器地址
+        server-addr: 192.168.10.40:8848 # Nacos服务器地址
+#        server-addr: 120.46.159.163:7148 # Nacos服务器地址
         namespace: ezhizao_dms # 命名空间
         #config:
         #server-addr: 114.116.195.82:8848 # Nacos服务器地址

src/main/resources/mybatis/business/carrier/BizCarrierRejectMapper.xml

@@ -18,6 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="code != null  and code != ''"> AND t2.code like concat('%',#{code},'%')</if>
             <if test="isAbandoned != null "> AND t1.is_abandoned = #{isAbandoned}</if>
         </trim>
+        order by t1.create_time desc
     </select>
 
     <delete id="physicalDelete">

src/main/resources/mybatis/business/deptProcess/BizDeptProcessMapper.xml

@@ -13,8 +13,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT * FROM biz_dept_process
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             deleted = 0
-            <if test="processCode != null  and processCode != ''"> AND process_code = #{processCode}</if>
-            <if test="processAlias != null  and processAlias != ''"> AND process_alias = #{processAlias}</if>
+            <if test="processCode != null  and processCode != ''"> AND process_code like concat('%',#{processCode},'%')</if>
+            <if test="processAlias != null  and processAlias != ''"> AND process_alias like concat('%',#{processAlias},'%')</if>
             <if test="deptId != null  and deptId != ''"> AND dept_id = #{deptId}</if>
             <if test="tenantId != null  and tenantId != 0"> AND tenant_id = #{tenantId}</if>
         </trim>

src/main/resources/mybatis/business/product/BizProductMapper.xml

@@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="specification != null  and specification != ''"> AND specification LIKE CONCAT('%', #{specification}, '%')</if>
             <if test="drawingNumber != null  and drawingNumber != ''"> AND drawing_number LIKE CONCAT('%',#{drawingNumber},'%')</if>
             <if test="companyAlias != null  and companyAlias != ''">  AND company_alias LIKE CONCAT('%', #{companyAlias}, '%')</if>
-            <if test="description != null  and description != ''"> AND description = #{description}</if>
+            <if test="description != null  and description != ''"> AND description like concat('%',#{description},'%')</if>
             <if test="diameter != null "> AND diameter = #{diameter}</if>
             <if test="lenght != null "> AND lenght = #{lenght}</if>
             <if test="thickness != null "> AND thickness = #{thickness}</if>

src/main/resources/mybatis/business/resourceGroup/BizProductionResourceGroupDetailMapper.xml

@@ -6,17 +6,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <resultMap type="cn.ezhizao.project.business.resourceGroup.domain.BizProductionResourceGroupDetail" id="BizProductionResourceGroupDetailResult">
         <id column="id" property="id"/>
+        <association property="resourceCode" column="production_resource_group_id" javaType="java.lang.String" select="getResourceCode"/>
+        <association property="nickName" column="production_resource_group_id" javaType="java.lang.String" select="getNiceName"/>
     </resultMap>
 
-
+    <select id="getResourceCode" resultType="java.lang.String">
+        select code from biz_production_resource_group where deleted = 0 and id = #{productionResourceGroupId}
+    </select>
     <select id="getList" parameterType="BizProductionResourceGroupDetail" resultMap="BizProductionResourceGroupDetailResult">
+        SELECT t1.*  FROM biz_production_resource_group_detail t1
+        <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
+            t1.deleted = 0
+            <if test="productionResourceGroupId != null  and productionResourceGroupId != ''"> AND t1.production_resource_group_id = #{productionResourceGroupId}</if>
+            <if test="commonCode != null  and commonCode != ''"> AND (t1.common_code like concat('%', #{commonCode}, '%') or t1.common_name like concat('%', #{commonCode}, '%'))</if>
+            <if test="commonType != null  and commonType != ''"> AND t1.common_type = #{commonType}</if>
+        </trim>
+        order by production_resource_group_id desc
+    </select>
+
+    <select id="getNiceName" resultType="java.lang.String">
+        select  GROUP_CONCAT( common_name SEPARATOR ', ' ) as nickName from biz_production_resource_group_detail where deleted = 0 and production_resource_group_id = #{productionResourceGroupId} and common_type = 'person'
+    </select>
+    <select id="getEquipmentList" parameterType="BizProductionResourceGroupDetail" resultMap="BizProductionResourceGroupDetailResult">
         SELECT * FROM biz_production_resource_group_detail
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
-            deleted = 0
+            deleted = 0 and common_type = 'equipmentDetail'
             <if test="productionResourceGroupId != null  and productionResourceGroupId != ''"> AND production_resource_group_id = #{productionResourceGroupId}</if>
             <if test="commonCode != null  and commonCode != ''"> AND common_code like concat('%', #{commonCode}, '%')</if>
             <if test="commonType != null  and commonType != ''"> AND common_type = #{commonType}</if>
+
         </trim>
+        order by production_resource_group_id desc
     </select>
 
     <delete id="physicalDelete">

src/main/resources/mybatis/business/resourceGroup/BizProductionResourceGroupMapper.xml

@@ -6,11 +6,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <resultMap type="cn.ezhizao.project.business.resourceGroup.domain.BizProductionResourceGroup" id="BizProductionResourceGroupResult">
         <id column="id" property="id"/>
+        <association property="nickName" column="id" javaType="java.lang.String" select="getNiceName"/>
         <collection property="groupDetailList" column="id" ofType="cn.ezhizao.project.business.resourceGroup.domain.BizProductionResourceGroupDetail" select="getGroupDetailList"/>
+        <collection property="groupEquipmentList" column="id" ofType="cn.ezhizao.project.business.resourceGroup.domain.BizProductionResourceGroupDetail" select="getGroupEquipmentList"/>
     </resultMap>
     <resultMap type="cn.ezhizao.project.business.resourceGroup.domain.BizProductionResourceGroupDetail" id="BizProductionResourceGroupDetailResult">
         <id column="id" property="id"/>
     </resultMap>
+    <select id="getNiceName" resultType="java.lang.String">
+        select  GROUP_CONCAT( common_name SEPARATOR ', ' ) as nickName from biz_production_resource_group_detail where deleted = 0 and production_resource_group_id = #{id} and common_type = 'person'
+    </select>
+
+    <select id="getGroupEquipmentList" resultMap="BizProductionResourceGroupDetailResult">
+        select * from biz_production_resource_group_detail where  deleted = 0 and production_resource_group_id = #{id} and common_type = 'equipmentDetail'
+    </select>
     <select id="getGroupDetailList" resultMap="BizProductionResourceGroupDetailResult">
         select * from biz_production_resource_group_detail where  deleted = 0 and production_resource_group_id = #{id}
     </select>
@@ -18,7 +27,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT * FROM biz_production_resource_group
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             deleted = 0
-            <if test="code != null  and code != ''"> AND code = #{code}</if>
+            <if test="id != null  and id != ''"> AND id = #{id}</if>
+            <if test="code != null  and code != ''"> AND code like concat('%',#{code},'%')</if>
             <if test="deptId != null  and deptId != ''"> AND dept_id = #{deptId}</if>
         </trim>
     </select>

src/main/resources/mybatis/business/technologicalProcessDetail/BizTechnologicalProcessDetailMapper.xml

@@ -31,6 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by process_step_number
     </select>
 
+
     <delete id="physicalDelete">
         DELETE FROM biz_technological_process_detail
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">

src/main/resources/mybatis/system/SysDeptMapper.xml

@@ -61,6 +61,12 @@
 		<if test="tenantId != null  and tenantId != 0">
 			AND tenant_id = #{tenantId}
 		</if>
+		<if test="deptIds != null and deptIds.size() > 0">
+		and dept_id in
+		<foreach collection="deptIds" item="id" open="(" separator="," close=")">
+			#{id}
+		</foreach>
+		</if>
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
 		order by parent_id, order_num

src/main/resources/mybatis/system/SysUserMapper.xml

@@ -91,7 +91,7 @@
 
 	<!-- 用户列表 selectUserList -->
 	<select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
-		SELECT u.user_id,
+		SELECT distinct u.user_id,
 		       u.nick_name,
 		       u.user_name,
 		       u.email,
@@ -105,7 +105,7 @@
 		       u.create_by,
 		       u.create_time,
 		       u.remark FROM sys_user u left join sys_dept_user d on u.user_id = d.user_id
-		WHERE u.del_flag = '0'
+		WHERE u.del_flag = '0' and d.deleted = 0
 		<if test="userId != null and userId != 0">
 			AND u.user_id = #{userId}
 		</if>