1、会员管理调整数据参数

2、会员项目管理调整数据参数
3、会员项目管理调整删除功能，新增删除接口

fs-admin/src/main/java/com/fs/store/controller/FsUserController.java

@@ -157,6 +157,16 @@ public class FsUserController extends BaseController
     {
         return toAjax(fsUserService.deleteFsUserByIds(userIds));
     }
+    /**
+     * 删除微信用户和销售关系信息
+     */
+    @PreAuthorize("@ss.hasPermi('store:userCompanyUser:remove')")
+    @Log(title = "微信用户和销售关系", businessType = BusinessType.DELETE)
+    @DeleteMapping("/delete/{id}")
+    public AjaxResult delete(@PathVariable Long id)
+    {
+        return toAjax(userCompanyUserService.deleteFsUserCompanyUserById(id));
+    }
 
 
     @GetMapping("/getUserList")

fs-service-system/src/main/java/com/fs/store/vo/FSUserVO.java

@@ -51,4 +51,9 @@ public class FSUserVO extends FsUser implements Serializable
     @Excel(name = "状态", sort = 7)
     private String statusName;
 
+    /**
+     * 销售用户关联id
+     */
+    private Long companyUserId;
+
 }

fs-service-system/src/main/resources/mapper/store/FsUserMapper.xml

@@ -279,7 +279,7 @@
         LEFT JOIN company_user ON company_user.user_id = u.company_user_id
         LEFT JOIN company on company.company_id = company_user.company_id
         <where>
-        1 = 1
+        1 = 1 and u.nickname is not null
         <if test = "maps.userId != null" >
             AND u.user_id = #{maps.userId}
         </if >
@@ -306,6 +306,9 @@
         <if test = "maps.companyName != null and maps.companyName != '' " >
             AND company.company_name like CONCAT ("%",#{maps.companyName},"%")
         </if >
+            <if test = "maps.companyId != null and maps.companyId != '' " >
+                AND company.company_id = #{maps.companyId}
+            </if >
         <if test = "maps.level != null  and  maps.level !=''" >
         AND u.LEVEL = #{maps.level}
         </if >
@@ -324,7 +327,8 @@
         u.*,
         fcc.watch_course_count, fcc.part_course_count, company_user.nick_name AS companyUserNickName, fcc.last_watch_date
         ,company.company_name,
-        ucu.project_id
+        ucu.project_id,
+        ucu.id as companyUserId
         FROM
         fs_user u
         LEFT JOIN (
@@ -353,9 +357,12 @@
         LEFT JOIN company_user ON company_user.user_id = ucu.company_user_id
         LEFT JOIN company on company.company_id = company_user.company_id
         <where>
-        1 = 1
+        1 = 1 and u.nickname is not null
         <if test = "maps.nickname != null and  maps.nickname !='' " >
             AND u.nickname LIKE CONCAT("%",#{maps.nickname},"%")
+        </if >
+            <if test = "maps.userId != null and  maps.userId !='' " >
+            AND u.user_id = #{maps.userId}
         </if >
         <if test = "maps.phone != null   and  maps.phone !='' " >
         AND u.phone LIKE CONCAT("%",#{maps.phone},"%")
@@ -377,6 +384,9 @@
         <if test = "maps.companyName != null and maps.companyName != '' " >
             AND company.company_name like CONCAT ("%",#{maps.companyName},"%")
         </if >
+            <if test = "maps.companyId != null and maps.companyId != '' " >
+                AND company.company_id = #{maps.companyId}
+            </if >
         <if test = "maps.level != null  and  maps.level !=''" >
         AND u.LEVEL = #{maps.level}
         </if >