Browse Source

客户丢失BUG修复

anderx 10 months ago
parent
commit
7f3e4a0ab1

+ 7 - 1
src/main/java/com/goafanti/common/mapper/UserMapper.xml

@@ -1391,7 +1391,7 @@
         </if>
     </select>
     <select id="findMainProductsList" resultType="com.goafanti.customer.bo.OutUserMianProducts">
-        select oi.id ,u.id uid, u.nickname userName, oi.business_scope businessScope,
+        select oi.id ,u.id uid, u.nickname userName, oi.business_scope businessScope,u.nature,u.nature_other natureOther,
         um.update_name updateName,um.update_aid updateAid,u.share_type shareType,
         <if test="shiroType ==2">
             a.name adminName,d.name depName,dg.name province,
@@ -1428,6 +1428,9 @@
         <if test="userName != null">
             and u.nickname like concat('%',#{userName},'%')
         </if>
+          <if test="nature !=null">
+            and u.nature = #{nature}
+        </if>
         <if test="key !=null">
             and oi.business_scope like concat('%',#{key},'%')
         </if>
@@ -1470,6 +1473,9 @@
         <if test="userName != null">
             and u.nickname like concat('%',#{userName},'%')
         </if>
+        <if test="nature !=null">
+            and u.nature = #{nature}
+        </if>
         <if test="key !=null">
             and oi.business_scope like concat('%',#{key},'%')
         </if>

+ 9 - 0
src/main/java/com/goafanti/customer/bo/InputMainProductsList.java

@@ -10,9 +10,18 @@ public class InputMainProductsList {
     private String adminName;
     private String depId;
     private Integer shareType;
+    private Integer nature;
     private Integer pageNo;
     private Integer pageSize;
 
+    public Integer getNature() {
+        return nature;
+    }
+
+    public void setNature(Integer nature) {
+        this.nature = nature;
+    }
+
     public Integer getShareType() {
         return shareType;
     }

+ 18 - 0
src/main/java/com/goafanti/customer/bo/OutUserMianProducts.java

@@ -10,10 +10,28 @@ public class OutUserMianProducts {
     private String depName;
     private String updateAid;
     private Integer shareType;
+    private Integer nature;
+    private String natureOther;
     private String province;
     private String transferTimes;
     private String dateUpdateTimes;
 
+    public Integer getNature() {
+        return nature;
+    }
+
+    public void setNature(Integer nature) {
+        this.nature = nature;
+    }
+
+    public String getNatureOther() {
+        return natureOther;
+    }
+
+    public void setNatureOther(String natureOther) {
+        this.natureOther = natureOther;
+    }
+
     public String getProvince() {
         return province;
     }