fix 学员资料变更

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/UserUpdate.java

@@ -44,4 +44,7 @@ private static final long serialVersionUID=1L;
     /** 1已读 2未读 */
     private Integer status;
 
+    /** 修改人 */
+    private String modifierName;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserUpdateMapper.java

@@ -15,5 +15,5 @@ import java.util.List;
  */
 public interface UserUpdateMapper extends BaseMapper<UserUpdate> {
     List<UserUpdateVo> getLastThree(ConsoleQueryBo bo);
-    List<UserUpdateVo> selectChangeInfo(ConsoleQueryBo bo);
+    List<UserUpdate> selectChangeInfo(ConsoleQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserUpdateServiceImpl.java

@@ -123,7 +123,7 @@ public class UserUpdateServiceImpl extends ServiceImpl<UserUpdateMapper, UserUpd
 
     @Override
     public List<UserUpdateVo> listUserChangeInfo(ConsoleQueryBo bo) {
-        List<UserUpdateVo> userUpdateVos = baseMapper.selectChangeInfo(bo);
+        List<UserUpdateVo> userUpdateVos = entity2Vo(baseMapper.selectChangeInfo(bo));
         userUpdateVos.forEach(userUpdate->{
             LambdaQueryWrapper<ClassGradeUser> lqw = Wrappers.lambdaQuery();
             lqw.eq(Validator.isNotEmpty(userUpdate.getUserId()), ClassGradeUser::getUserId, userUpdate.getUserId());
@@ -139,6 +139,6 @@ public class UserUpdateServiceImpl extends ServiceImpl<UserUpdateMapper, UserUpd
             classGradeUser = iClassGradeUserService.getOne(lqw);
             userUpdate.setLastPeriodPlushTime(classGradeUser.getPeriodPlushTime());
         });
-        return baseMapper.selectChangeInfo(bo);
+        return userUpdateVos;
     }
 }

zhongzheng-system/src/main/resources/mapper/modules/user/UserUpdateMapper.xml

@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="telphone" column="telphone"/>
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
+        <result property="modifierName" column="modifierName"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.user.vo.UserUpdateVo" id="UserUpdateVoResult">
@@ -20,8 +21,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="realname" column="realname"/>
         <result property="idCard" column="id_card"/>
         <result property="telphone" column="telphone"/>
-        <result property="nowRealname" column="now_realname"/>
-        <result property="modifierName" column="modifierName"/>
     </resultMap>
 
     <select id="getLastThree" parameterType="com.zhongzheng.modules.base.bo.ConsoleQueryBo" resultMap="UserUpdateVoResult">
@@ -47,10 +46,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             LIMIT 3
     </select>
 
-    <select id="selectChangeInfo" parameterType="com.zhongzheng.modules.base.bo.ConsoleQueryBo" resultMap="UserUpdateVoResult">
+    <select id="selectChangeInfo" parameterType="com.zhongzheng.modules.base.bo.ConsoleQueryBo" resultMap="UserUpdateResult">
         SELECT
-        uu.*,
-        u.realname AS now_realname
+        uu.*
         FROM
         `order` o
         LEFT JOIN order_goods og ON o.order_sn = og.order_sn