merge5-18

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -262,14 +262,14 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         userUpdateAddBo.setModifierName(loginUser.getUsername());
         UserVo oldUser = queryById(bo.getUserId());
         if (!StringUtils.isBlank(update.getRealname())){
-            if(!oldUser.getRealname().equals(update.getRealname())){
+            if(Validator.isEmpty(oldUser.getRealname()) || !oldUser.getRealname().equals(update.getRealname())){
                 userUpdateAddBo.setUserId(bo.getUserId());
                 userUpdateAddBo.setRealname(update.getRealname());
             }
         }
         if (!StringUtils.isBlank(update.getTelphone())){
             //手机号变更
-            if(!oldUser.getTelphone().equals(update.getTelphone())){
+            if(Validator.isEmpty(oldUser.getTelphone()) || !oldUser.getTelphone().equals(update.getTelphone())){
                 User user = getOne(new LambdaQueryWrapper<User>()
                         .eq(User::getTelphone,update.getTelphone()).ne(User::getUserId,update.getUserId()).last("limit 1"));
                 if(Validator.isNotNull(user)){
@@ -281,8 +281,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
 
         }
         if (!StringUtils.isBlank(update.getIdCard())){
-            //手机号变更
-            if(!oldUser.getIdCard().equals(update.getIdCard())){
+            //身份证变更
+            if(Validator.isEmpty(oldUser.getIdCard()) || !oldUser.getIdCard().equals(update.getIdCard())){
                 Long list = iClassGradeUserService.selectList(update);
                 if (list > 0){
                     throw new IllegalAccessException("身份证已经被使用注册为学员");

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/bo/ConsoleQueryBo.java

@@ -16,6 +16,19 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 public class ConsoleQueryBo extends BaseEntity {
 
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
 	/** 业务层次id */
 	@Excel(name = "业务层次id")
 	@ApiModelProperty("业务层次id")

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

@@ -8,6 +8,9 @@ import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.base.bo.ConsoleQueryBo;
 import com.zhongzheng.modules.grade.domain.ClassGradeUser;
 import com.zhongzheng.modules.grade.service.IClassGradeUserService;
+import com.zhongzheng.modules.user.domain.User;
+import com.zhongzheng.modules.user.service.IUserService;
+import com.zhongzheng.modules.user.vo.UserVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -39,6 +42,9 @@ public class UserUpdateServiceImpl extends ServiceImpl<UserUpdateMapper, UserUpd
     @Autowired
     private IClassGradeUserService iClassGradeUserService;
 
+    @Autowired
+    private IUserService iUserService;
+
     @Override
     public UserUpdateVo queryById(Long id){
         UserUpdate db = this.baseMapper.selectById(id);
@@ -76,6 +82,26 @@ public class UserUpdateServiceImpl extends ServiceImpl<UserUpdateMapper, UserUpd
         return voList;
     }
 
+    /**
+     * 实体类转化成视图对象
+     *
+     * @param collection 实体类集合
+     * @return
+     */
+    private List<UserUpdateVo> entity2UserUpdateVo(Collection<UserUpdate> collection) {
+        List<UserUpdateVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, UserUpdateVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<UserUpdate> page = (Page<UserUpdate>) collection;
+            Page<UserUpdateVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page, pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
     @Override
     public Boolean insertByAddBo(UserUpdateAddBo bo) {
         UserUpdate add = BeanUtil.toBean(bo, UserUpdate.class);
@@ -123,7 +149,7 @@ public class UserUpdateServiceImpl extends ServiceImpl<UserUpdateMapper, UserUpd
 
     @Override
     public List<UserUpdateVo> listUserChangeInfo(ConsoleQueryBo bo) {
-        List<UserUpdateVo> userUpdateVos = baseMapper.selectChangeInfo(bo);
+        List<UserUpdateVo> userUpdateVos = entity2UserUpdateVo(baseMapper.selectChangeInfo(bo));
         userUpdateVos.forEach(userUpdate->{
             LambdaQueryWrapper<ClassGradeUser> lqw = Wrappers.lambdaQuery();
             lqw.eq(Validator.isNotEmpty(userUpdate.getUserId()), ClassGradeUser::getUserId, userUpdate.getUserId());
@@ -138,7 +164,12 @@ public class UserUpdateServiceImpl extends ServiceImpl<UserUpdateMapper, UserUpd
             lqw.last("limit 1");
             classGradeUser = iClassGradeUserService.getOne(lqw);
             userUpdate.setLastPeriodPlushTime(classGradeUser.getPeriodPlushTime());
+
+            LambdaQueryWrapper<User> lq = Wrappers.lambdaQuery();
+            lq.eq(Validator.isNotEmpty(userUpdate.getUserId()), User::getUserId, userUpdate.getUserId());
+            User user = iUserService.getOne(lq);
+            userUpdate.setNowRealname(user.getRealname());
         });
-        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="modifier_name"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.user.vo.UserUpdateVo" id="UserUpdateVoResult">
@@ -21,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="idCard" column="id_card"/>
         <result property="telphone" column="telphone"/>
         <result property="nowRealname" column="now_realname"/>
-        <result property="modifierName" column="modifierName"/>
+        <result property="modifierName" column="modifier_name"/>
     </resultMap>
 
     <select id="getLastThree" parameterType="com.zhongzheng.modules.base.bo.ConsoleQueryBo" resultMap="UserUpdateVoResult">
@@ -47,10 +48,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