anderx пре 1 година
родитељ
комит
899698c617

+ 18 - 0
src/main/java/com/goafanti/common/mapper/UserMapperExt.xml

@@ -2435,6 +2435,15 @@ inner join(
 		</if>
 		where a.`type` =1 and a.status =0 and a.share_type in (0,1,4)
 		  and a.aid = #{aid}
+		<if test="name != null">
+			and a.nickname like concat('%',#{name},'%')
+		</if>
+		<if test="shareType !=null">
+			and a.share_type = #{shareType}
+		</if>
+		<if test="level !=null">
+			and a.level = #{level}
+		</if>
 		<if test="page_sql != null">
 			${page_sql}
 		</if>
@@ -2450,5 +2459,14 @@ inner join(
 	</if>
 		where a.`type` =1 and a.status =0 and a.share_type in (0,1,4)
 		and a.aid = #{aid}
+		<if test="name != null">
+			and a.nickname like concat('%',#{name},'%')
+		</if>
+		<if test="shareType !=null">
+			and a.share_type = #{shareType}
+		</if>
+		<if test="level !=null">
+			and a.level = #{level}
+		</if>
 	</select>
 </mapper>

+ 28 - 0
src/main/java/com/goafanti/customer/bo/SelectMyUserBo.java

@@ -6,9 +6,37 @@ public class SelectMyUserBo {
      *  0=所有,1=公出过的企业
      */
     private Integer type;
+    private Integer level;
+
+    private Integer shareType;
+    private String name;
     private Integer pageNo;
     private Integer pageSize;
 
+    public Integer getShareType() {
+        return shareType;
+    }
+
+    public void setShareType(Integer shareType) {
+        this.shareType = shareType;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Integer getLevel() {
+        return level;
+    }
+
+    public void setLevel(Integer level) {
+        this.level = level;
+    }
+
     public Integer getType() {
         return type;
     }

+ 1 - 1
src/main/java/com/goafanti/customer/controller/AdminCustomerApiController.java

@@ -1632,7 +1632,7 @@ public class AdminCustomerApiController extends BaseApiController{
 
 	/**
 	 * 获取我的客户信息
-	 * @param in
+	 * @param id
 	 * @return
 	 */
 	@GetMapping("/selectMyUserDetails")

+ 4 - 0
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -3181,6 +3181,9 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 	public Pagination<SelectMyUserOut> selectMyUser(SelectMyUserBo in) {
 		Map<String, Object> params = new HashMap<>();
 		if (in.getType() != null) params.put("type", in.getType());
+		if (in.getLevel() !=null) params.put("level", in.getLevel());
+		if (in.getShareType() != null) params.put("shareType", in.getShareType());
+		if (in.getName() != null) params.put("name", in.getName());
 		params.put("aid", TokenManager.getAdminId());
 		Pagination<SelectMyUserOut> list = (Pagination<SelectMyUserOut>) findPage("selectMyUserList",
 				"selectMyUserCount", params, in.getPageNo(), in.getPageSize());
@@ -3189,6 +3192,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 
 	@Override
 	public Object selectMyUserDetails(String id) {
+		
 		return null;
 	}