便签管理

yijia-label/src/main/java/com/yijia/label/controller/LabelRuleController.java

@@ -157,12 +157,14 @@ public class LabelRuleController extends BaseController
                     LabelRule labelRule =new LabelRule();
                     labelRule.setId(ids);
                     labelRule.setDelFlag("1");
+                    labelRule.setUpdateBy(currentUser.getUser().getUserId()+"");
                     labelRuleService.updateLabelRule(labelRule);
-                    LabelRuleDetail detil =new LabelRuleDetail();
-                    detil.setParentId(ids);
-                    List<LabelRuleDetail> detailList =labelRuleDetailService.selectLabelRuleDetailList(detil);
+                    LabelRuleDetail labelRuleDetail =new LabelRuleDetail();
+                    labelRuleDetail.setParentId(ids);
+                    List<LabelRuleDetail> detailList =labelRuleDetailService.selectLabelRuleDetailList(labelRuleDetail);
                     for( LabelRuleDetail detail:detailList){
                         detail.setDelFlag("1");
+                        detail.setUpdateBy(currentUser.getUser().getUserId()+"");
                         labelRuleDetailService.updateLabelRuleDetail(detail);
                     }
                 }

yijia-label/src/main/java/com/yijia/label/service/impl/CustomerLabelServiceImpl.java

@@ -116,6 +116,7 @@ public class CustomerLabelServiceImpl implements ICustomerLabelService
         CustomerLabel label =customerLabelMapper.selectCustomerLabelInfo(labelInfo);
         if(label!=null&& label.getId()!=null){
             label.setDelFlag("1");
+            label.setUpdateBy(customerLabel.getUpdateBy());
             label.setUpdateTime(DateUtils.getNowDate());
             i=customerLabelMapper.updateCustomerLabel(label);
         }

yijia-label/src/main/resources/mapper/label/CustomerLabelMapper.xml

@@ -41,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         and phone_number  not in
         ( select phone from customer_label b
         <where>
+            <if test="stationId != null "> and b.station_id = #{stationId}</if>
             <if test="labelId != null "> and label_id != #{labelId}</if>
             <if test="delFlag != null "> and del_flag = #{delFlag}</if>
         </where>  )