zangguocen 4 år sedan
förälder
incheckning
fb409455a6

+ 0 - 1
yijia-label/pom.xml

@@ -12,7 +12,6 @@
     <description>营销管理模块</description>
 
     <dependencies>
-
         <!-- 通用工具-->
         <dependency>
             <groupId>com.yijia</groupId>

+ 2 - 1
yijia-label/src/main/java/com/yijia/label/controller/CustomerLabelController.java

@@ -130,7 +130,8 @@ public class CustomerLabelController extends BaseController
     {
         LoginUser currentUser = SecurityUtils.getLoginUser();
         customerLabel.setStationId(currentUser.getUser().getDeptId());
-        List<String> list = customerLabelService.selectPhoneList(customerLabel);
+        customerLabel.setDelFlag("0");
+        List<CustomerLabel> list = customerLabelService.selectCustomerLabelList(customerLabel);
         boolean flag =true;
         if(list!=null && list.size()>0){
             flag=false;

+ 1 - 2
yijia-label/src/main/resources/mapper/label/CustomerLabelMapper.xml

@@ -2,8 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yijia.markert.mapper.CustomerLabelMapper">
-    
+<mapper namespace="com.yijia.label.mapper.CustomerLabelMapper">
     <resultMap type="CustomerLabel" id="CustomerLabelResult">
         <result property="id"    column="id"    />
         <result property="phone"    column="phone"    />

+ 1 - 1
yijia-label/src/main/resources/mapper/label/LabelRuleDetailMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yijia.markert.mapper.LabelRuleDetailMapper">
+<mapper namespace="com.yijia.label.mapper.LabelRuleDetailMapper">
     
     <resultMap type="LabelRuleDetail" id="LabelRuleDetailResult">
         <result property="id"    column="id"    />

+ 1 - 1
yijia-label/src/main/resources/mapper/label/LabelRuleMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yijia.markert.mapper.LabelRuleMapper">
+<mapper namespace="com.yijia.label.mapper.LabelRuleMapper">
     
     <resultMap type="LabelRule" id="LabelRuleResult">
         <result property="id"    column="id"    />