diff --git a/src/main/java/com/qs/serve/modules/biz/entity/BizUserGroup.java b/src/main/java/com/qs/serve/modules/biz/entity/BizUserGroup.java
index 39589c09..b5a8c82f 100644
--- a/src/main/java/com/qs/serve/modules/biz/entity/BizUserGroup.java
+++ b/src/main/java/com/qs/serve/modules/biz/entity/BizUserGroup.java
@@ -34,6 +34,7 @@ public class BizUserGroup implements Serializable {
 
     /** 分组名称 */
     @Length(max = 255,message = "分组名称长度不能超过255字")
+    @TableField(condition = SqlCondition.LIKE)
     private String groupName;
 
     /** 用户ID */
diff --git a/src/main/java/com/qs/serve/modules/biz/entity/BizUserGroupItem.java b/src/main/java/com/qs/serve/modules/biz/entity/BizUserGroupItem.java
index eed38bf6..fcb5ee39 100644
--- a/src/main/java/com/qs/serve/modules/biz/entity/BizUserGroupItem.java
+++ b/src/main/java/com/qs/serve/modules/biz/entity/BizUserGroupItem.java
@@ -44,10 +44,12 @@ public class BizUserGroupItem implements Serializable {
 
     /** 目标 */
     @Length(max = 255,message = "目标长度不能超过255字")
+    @TableField(condition = SqlCondition.LIKE)
     private String targetName;
 
     /** 目标编码 */
     @Length(max = 255,message = "目标编码长度不能超过255字")
+    @TableField(condition = SqlCondition.LIKE)
     private String targetCode;
 
     /** 备注 */
diff --git a/src/main/java/com/qs/serve/modules/bms/entity/vo/BmsSubjectTreeVo.java b/src/main/java/com/qs/serve/modules/bms/entity/vo/BmsSubjectTreeVo.java
index 9bc4359b..b950ec07 100644
--- a/src/main/java/com/qs/serve/modules/bms/entity/vo/BmsSubjectTreeVo.java
+++ b/src/main/java/com/qs/serve/modules/bms/entity/vo/BmsSubjectTreeVo.java
@@ -38,6 +38,8 @@ public class BmsSubjectTreeVo extends TreeNode {
     /** 行政区域:0全部可见；1-部分可见；2-全部不可见 */
     private Integer bizRegionFlag;
 
+    private Integer level;
+
     /** 备注 */
     @Length(max = 255,message = "备注长度不能超过255字")
     private String remark;
diff --git a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierServiceImpl.java b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierServiceImpl.java
index e5a4c39c..6d25e672 100644
--- a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierServiceImpl.java
@@ -54,6 +54,13 @@ public class BmsSupplierServiceImpl extends ServiceImpl<BmsSupplierMapper,BmsSup
             BmsSupplier dbSupplier = this.getById(param.getId());
             orgSaleRegionId = dbSupplier.getRegionLast();
             orgBizRegionId = dbSupplier.getRegion2Last();
+        }else if(StringUtils.hasText(param.getCode())){
+            LambdaQueryWrapper<BmsSupplier> checkCode = new LambdaQueryWrapper<>();
+            checkCode.eq(BmsSupplier::getCode,param.getCode());
+            long count = baseMapper.selectCount(checkCode);
+            if(count>0){
+                Assert.throwEx("编码重复");
+            }
         }
         if(StringUtils.hasText(param.getMgrId())){
             SysUser sysUser = sysUserService.getById(param.getMgrId());
diff --git a/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSkuServiceImpl.java b/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSkuServiceImpl.java
index 06629b32..e3dac528 100644
--- a/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSkuServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSkuServiceImpl.java
@@ -242,7 +242,9 @@ public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper,GoodsSku> im
             if(dbGoodSku!=null){
                 skuCheckLqw.ne(GoodsSku::getId,dbGoodSku.getId());
             }
+            skuCheckLqw.eq(GoodsSku::getSpuId,goodSkuVo.getSpuId());
             skuCheckLqw.eq(GoodsSku::getBelong,goodSkuVo.getBelong());
+            skuCheckLqw.eq(GoodsSku::getSpecialFlag,0);
             skuCheckLqw.eq(GoodsSku::getOrderFlag,1);
             if(this.count(skuCheckLqw)>0){
                 Assert.throwEx("下单的产地需唯一");
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 2662b766..9639c5d9 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
@@ -237,12 +237,12 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper,OmsOrder> im
             order.setSupplierName(supplier.getSupplierName());
             order.setSupplierCode(supplier.getSupplierCode());
         }
-        if(StringUtils.hasText(param.getUserId())){
-            SysUser sysUser = sysUserService.getById(param.getUserId());
-            order.setUserId(param.getUserId());
-            order.setUserPhone(sysUser.getMobile());
-            order.setUserCode(sysUser.getCode());
-        }
+        //if(StringUtils.hasText(param.getUserId())){
+        SysUser sysUser = sysUserService.getById(AuthContextUtils.getSysUserId());
+        order.setUserId(param.getUserId());
+        order.setUserPhone(sysUser.getMobile());
+        order.setUserCode(sysUser.getCode());
+        //}
         order.setBillType(param.getBillType());
         order.setUrgentFlag(param.getUrgentFlag());
         order.setRemark(param.getRemark());
diff --git a/src/main/java/com/qs/serve/modules/sys/service/impl/SysDeleteLogServiceImpl.java b/src/main/java/com/qs/serve/modules/sys/service/impl/SysDeleteLogServiceImpl.java
index 130ec9cc..e4116b29 100644
--- a/src/main/java/com/qs/serve/modules/sys/service/impl/SysDeleteLogServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/sys/service/impl/SysDeleteLogServiceImpl.java
@@ -85,9 +85,9 @@ public class SysDeleteLogServiceImpl extends ServiceImpl<SysDeleteLogMapper,SysD
         tbsCostApplyRemoveMapper.tbs_budget_cost_item(costApplyId);
         tbsCostApplyRemoveMapper.tbs_budget_cost_item_split(costApplyId);
         tbsCostApplyRemoveMapper.vtb_fund_flow(costApplyId);
-        tbsCostApplyRemoveMapper.bir_activity_center_goods(costApplyId);
-        tbsCostApplyRemoveMapper.bir_base_activity(costApplyId);
-        tbsCostApplyRemoveMapper.bir_payment_item(costApplyId);
+        //tbsCostApplyRemoveMapper.bir_activity_center_goods(costApplyId);
+        //tbsCostApplyRemoveMapper.bir_base_activity(costApplyId);
+        //tbsCostApplyRemoveMapper.bir_payment_item(costApplyId);
         tbsCostApplyRemoveMapper.vtb_verification_subject(costApplyId);
         tbsCostApplyRemoveMapper.vtb_verification_yard_item(costApplyId);
         tbsCostApplyRemoveMapper.vtb_verification_yard_center_item(costApplyId);
diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java
index e8eb2c4b..a0286d5e 100644
--- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java
@@ -64,6 +64,9 @@ public class TbsCostApplyPart1ServiceImpl implements TbsCostApplyPart1Service {
         final String newCostApplyCode = CodeGenUtil.generate(CodeGenUtil.SourceKey.CostApply);
         TbsCostApply costApply = tbsCostApplyService.getById(costId);
         costApply.setId(null);
+        costApply.setUserId(null);
+        costApply.setUserCode(null);
+        costApply.setUserName(null);
         costApply.setCode(newCostApplyCode);
         costApply.setCreateBy(null);
         costApply.setCreateTime(null);
diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java
index 43f06627..f9841e6d 100644
--- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java
@@ -179,13 +179,9 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
         rmLogLqw.eq(TbsBudgetLog::getCostApplyId,id);
         budgetLogService.remove(rmLogLqw);
         //删除BIR
-        LambdaQueryWrapper<BirActivityCenterGoods> birActivityCenterGoodsLqw = new LambdaQueryWrapper<>();
-        birActivityCenterGoodsLqw.eq(BirActivityCenterGoods::getCostApplyId,id);
-        birActivityCenterGoodsMapper.delete(birActivityCenterGoodsLqw);
-
-        LambdaQueryWrapper<BirBaseActivity> birBaseActivityLqw = new LambdaQueryWrapper<>();
-        birBaseActivityLqw.eq(BirBaseActivity::getCostApplyId,id);
-        birBaseActivityMapper.delete(birBaseActivityLqw);
+//        LambdaQueryWrapper<BirActivityCenterGoods> birActivityCenterGoodsLqw = new LambdaQueryWrapper<>();
+//        birActivityCenterGoodsLqw.eq(BirActivityCenterGoods::getCostApplyId,id);
+//        birActivityCenterGoodsMapper.delete(birActivityCenterGoodsLqw);
 
         //命中预算
         budgetCostItemService.removeByCostApplyId(id);
diff --git a/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyItemController.java b/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyItemController.java
index 93d9cd5d..1e00b33d 100644
--- a/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyItemController.java
+++ b/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyItemController.java
@@ -53,6 +53,10 @@ public class TzcPolicyItemController {
     public R<List<TzcPolicyItem>> getList(TzcPolicyItem param){
         LambdaQueryWrapper<TzcPolicyItem> lqw = new LambdaQueryWrapper<>(param);
         List<TzcPolicyItem> list = tzcPolicyItemService.list(lqw);
+        for (TzcPolicyItem policyItem : list) {
+            List<TzcPolicyGoods> policyGoodsList = tzcPolicyGoodsService.listByItemId(policyItem.getId());
+            policyItem.setPolicyGoodsList(policyGoodsList);
+        }
         return R.ok(list);
     }
 
diff --git a/src/main/resources/mapper/goods/GoodsSpuMapper.xml b/src/main/resources/mapper/goods/GoodsSpuMapper.xml
index 69cbb869..63681e74 100644
--- a/src/main/resources/mapper/goods/GoodsSpuMapper.xml
+++ b/src/main/resources/mapper/goods/GoodsSpuMapper.xml
@@ -67,14 +67,13 @@
 
     <sql id="skuWherePart">
         <if test="query.belong != null"> and (`goods_sku`.`belong` = #{query.belong} or goods_sku.special_flag=1) </if>
-        <if test="query.selectSpecialFlag != null and query.selectSpecialFlag == 1">
-            and `goods_sku`.`special_flag` = 1
-            and `goods_sku`.id = goods_spu.special_sku_id
-        </if>
+
         <if test="query.selectSpecialFlag != null and query.selectSpecialFlag == 0">
-            and `goods_sku`.`special_flag` = 0
+            and `goods_sku`.`special_flag` = #{query.selectSpecialFlag}
         </if>
-        <if test="query.orderFlag != null"> and `goods_sku`.`order_flag` = #{query.orderFlag}</if>
+        <if test="query.orderFlag != null ">
+            and (`goods_sku`.`order_flag` = #{query.orderFlag} or `goods_sku`.`special_flag` = 1)
+         </if>
 
         <if test="query.keyword != null and query.keyword != '' ">
             and (
@@ -98,7 +97,9 @@
         <if test="query.cateSecondLabel != null and query.cateSecondLabel != ''"> and `cate2`.`name` like concat('%',#{query.cateSecondLabel},'%') </if>
         <if test="query.cateThirdLabel != null and query.cateThirdLabel != ''"> and `cate3`.`name` like concat('%',#{query.cateThirdLabel},'%') </if>
         <if test="query.categoryLast != null"> and `goods_spu`.`category_last` = #{query.categoryLast}</if>
-        <if test="query.shelf != null and query.shelf != ''"> and `goods_spu`.`shelf` = #{query.shelf}</if>
+        <if test="query.shelf != null"> and `goods_spu`.`shelf` = #{query.shelf}</if>
+        <if test="query.costFlag != null"> and `goods_spu`.`cost_flag` = #{query.costFlag}</if>
+        <if test="query.orderFlag != null"> and `goods_spu`.`order_flag` = #{query.orderFlag}</if>
         <if test="query.sort != null"> and `goods_spu`.`sort` = #{query.sort}</if>
         <if test="query.saleNum != null"> and `goods_spu`.`sale_num` = #{query.saleNum}</if>
         <if test="query.tasteValue != null and query.tasteValue != ''"> and `goods_spu`.`taste_value` like concat('%',#{query.tasteValue},'%') </if>
@@ -163,7 +164,7 @@
         FROM (
         (SELECT sku.*,ROW_NUMBER() OVER(PARTITION BY sku.spu_id ORDER BY sku.belong_sort) AS rn FROM goods_sku sku WHERE sku.order_flag = 1 AND sku.special_flag = 0)
         UNION ALL
-        SELECT sku.*,1 as rn FROM goods_sku sku WHERE sku.order_flag = 1 AND sku.special_flag = 1
+        SELECT sku.*,1 as rn FROM goods_sku sku WHERE sku.special_flag = 1
         ) AS goods_sku
         left join goods_spu on goods_sku.spu_id = goods_spu.id
         LEFT JOIN `goods_category` `cate1` ON `cate1`.`id` = `goods_spu`.`category_first`
@@ -183,7 +184,7 @@
         FROM (
         (SELECT sku.*,ROW_NUMBER() OVER(PARTITION BY sku.spu_id ORDER BY sku.belong_sort) AS rn FROM goods_sku sku WHERE sku.order_flag = 1 AND sku.special_flag = 0)
         UNION ALL
-        SELECT sku.*,1 as rn FROM goods_sku sku WHERE sku.order_flag = 1 AND sku.special_flag = 1
+        SELECT sku.*,1 as rn FROM goods_sku sku WHERE sku.special_flag = 1
         ) AS goods_sku
         left join goods_spu on goods_sku.spu_id = goods_spu.id
         <where>