From cf878860104fce1365c1d34ec5881042e5663da5 Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Wed, 19 Jun 2024 17:17:18 +0800
Subject: [PATCH] =?UTF-8?q?opt:=20=E9=83=A8=E9=97=A8=E6=8B=93=E5=B1=95?=
 =?UTF-8?q?=E5=81=9C=E7=94=A8=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java | 2 +-
 .../com/qs/serve/modules/sys/controller/SysDeptController.java | 3 +++
 src/main/java/com/qs/serve/modules/sys/entity/SysDept.java     | 3 +++
 src/main/resources/mapper/sys/SysDeptMapper.xml                | 1 +
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java
index e801ae23..81584e7c 100644
--- a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java
@@ -406,7 +406,7 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper,OmsOrder> im
                 skuList = goodsSkuService.listByIds(skuIds);
                 for (GoodsSku sku : skuList) {
                     if(!sku.getOrderFlag().equals(1)&&sku.getSpecialFlag().equals(0)){
-                        Assert.throwEx("单品["+sku.getSpuCode()+"]不予下单且非特殊品");
+                        Assert.throwEx("单品["+sku.getSkuCode()+"]不予下单且非特殊品");
                     }
                 }
                 skuIds.addAll(skuList.stream().map(GoodsSku::getSpuId).collect(Collectors.toList()));
diff --git a/src/main/java/com/qs/serve/modules/sys/controller/SysDeptController.java b/src/main/java/com/qs/serve/modules/sys/controller/SysDeptController.java
index fe092336..7cf4b8c0 100644
--- a/src/main/java/com/qs/serve/modules/sys/controller/SysDeptController.java
+++ b/src/main/java/com/qs/serve/modules/sys/controller/SysDeptController.java
@@ -49,6 +49,7 @@ public class SysDeptController {
     @PreAuthorize("hasRole('sys:dept:query')")
     public R<PageVo<SysDept>> getList(SysDept param){
         PageUtil.startPage();
+        param.setStopFlag(0);
         List<SysDept> list = sysDeptService.list(new QueryWrapper<>(param));
         return R.byPageHelperList(list);
     }
@@ -61,6 +62,7 @@ public class SysDeptController {
     @GetMapping("/list")
     @PreAuthorize("hasRole('sys:dept:query')")
     public R<List<SysDept>> getListAll(SysDept param){
+        param.setStopFlag(0);
         List<SysDept> list = sysDeptService.list(new QueryWrapper<>(param));
         return R.ok(list);
     }
@@ -74,6 +76,7 @@ public class SysDeptController {
     @GetMapping("/tree")
     @PreAuthorize("hasRole('sys:dept:query')")
     public R<?> getTreeList(SysDept param){
+        param.setStopFlag(0);
         List<SysDept> list = sysDeptService.listDept(param);
         List<SysDeptTreeNode> treeNodes = list.stream().map(dept->{
             SysDeptTreeNode treeNode = CopierUtil.copy(dept,new SysDeptTreeNode());
diff --git a/src/main/java/com/qs/serve/modules/sys/entity/SysDept.java b/src/main/java/com/qs/serve/modules/sys/entity/SysDept.java
index 2eee59dc..c7ba2a2b 100644
--- a/src/main/java/com/qs/serve/modules/sys/entity/SysDept.java
+++ b/src/main/java/com/qs/serve/modules/sys/entity/SysDept.java
@@ -44,6 +44,9 @@ public class SysDept implements Serializable {
     /** 级别路径 */
     private String levelPath;
 
+    /** 停用状态 */
+    private Integer stopFlag;
+
     /** 创建时间 */
     @TableField(fill = FieldFill.INSERT)
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
diff --git a/src/main/resources/mapper/sys/SysDeptMapper.xml b/src/main/resources/mapper/sys/SysDeptMapper.xml
index 2a4cff9d..c534fa85 100644
--- a/src/main/resources/mapper/sys/SysDeptMapper.xml
+++ b/src/main/resources/mapper/sys/SysDeptMapper.xml
@@ -41,6 +41,7 @@
         <where>
             <if test="id != null and id != ''"> and id = #{id}</if>
             <if test="code != null and code != ''"> and code = #{code}</if>
+            <if test="stopFlag != null"> and sys_dept.stop_flag = #{stopFlag}</if>
             <if test="createBy != null and createBy != ''"> and create_by = #{createBy}</if>
             <if test="updateBy != null and updateBy != ''"> and update_by = #{updateBy}</if>
             and sys_dept.del_flag = '0'