1、调整项目会员管理处理

fs-company/src/main/java/com/fs/company/controller/course/FsCourseRedPacketLogController.java

@@ -62,7 +62,7 @@ public class FsCourseRedPacketLogController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('course:courseRedPacketLog:list')")
     @GetMapping("/list")
-    public TableDataInfo list(FsCourseRedPacketLogParam fsCourseRedPacketLog)
+    public R list(FsCourseRedPacketLogParam fsCourseRedPacketLog)
     {
 //        startPage();
         if (fsCourseRedPacketLog.getPhoneMk() != null && fsCourseRedPacketLog.getPhoneMk() != "") {
@@ -77,9 +77,9 @@ public class FsCourseRedPacketLogController extends BaseController
             fsCourseRedPacketLog.setCompanyId( loginUser.getCompany().getCompanyId());
         }
 
-        PageInfo<FsCourseRedPacketLogListPVO> list = fsCourseRedPacketLogService.selectFsCourseRedPacketLogListVOPage(fsCourseRedPacketLog);
+        PageInfo<FsCourseRedPacketLogListPVO> pageInfo = fsCourseRedPacketLogService.selectFsCourseRedPacketLogListVOPage(fsCourseRedPacketLog);
 
-        return getDataTable(list.getList());
+        return R.ok().put("data", pageInfo);
     }
 
     /**

fs-service/src/main/java/com/fs/his/vo/FsUserVO.java

@@ -6,11 +6,13 @@ import com.fs.common.annotation.Excel;
 import com.fs.his.domain.FsUser;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class FsUserVO extends FsUser implements Serializable
 {

fs-service/src/main/resources/mapper/his/FsUserMapper.xml

@@ -2022,7 +2022,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectFsUserVOListByProjectNew" resultType="com.fs.his.vo.FsUserVO">
         SELECT
-            u.user_id, u.nick_name, u.avatar, u.phone, u.integral, u.now_money,
+            u.user_id, u.nick_name,u.nickname, u.avatar, u.phone, u.integral, u.now_money,
             ucu.project_id,ucu.id as companyUserId,ucu.create_time as bindTime,ucu.status,
             company.company_name,
             cu.nick_name   companyUserNickName
@@ -2035,7 +2035,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join
             company_user cu on cu.user_id = ucu.company_user_id
         <where>
-            1 = 1 and u.nick_name is not null
+            1 = 1 and u.nickName is not null
             and u.is_del = 0
             <if test = "maps.nickname != null and  maps.nickname !='' " >
                 AND u.nick_name LIKE CONCAT("%",#{maps.nickname},"%")