MERGE

zhongzheng-api/src/main/java/com/zhongzheng/controller/user/UserHandleController.java

@@ -42,11 +42,11 @@ public class UserHandleController extends BaseController {
      */
     @ApiOperation("用户经办名单列表")
     @GetMapping("/list")
-    public TableDataInfo<UserHandleVo> list(UserHandleQueryBo bo) {
+    public TableDataInfo<UserHandle> list(UserHandleQueryBo bo) {
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
         bo.setUserId(loginUser.getUser().getUserId());
         startPage();
-        List<UserHandleVo> list = iUserHandleService.queryUserHandleList(bo);
+        List<UserHandle> list = iUserHandleService.queryUserHandleList(bo);
         return getDataTable(list);
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -21,6 +21,7 @@ import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.type.EncryptHandler;
 import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.common.utils.SecurityUtils;
 import com.zhongzheng.common.utils.ToolsUtils;
 import com.zhongzheng.common.utils.http.HttpUtils;
 import com.zhongzheng.modules.course.domain.CourseSubject;

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

@@ -17,7 +17,7 @@ import java.util.List;
  */
 public interface IUserHandleService extends IService<UserHandle> {
 
-    List<UserHandleVo> queryUserHandleList(UserHandleQueryBo bo);
+    List<UserHandle> queryUserHandleList(UserHandleQueryBo bo);
 
     boolean saveUserHandle(List<UserHandleBo> bo);
 

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

@@ -32,7 +32,7 @@ import java.util.stream.Collectors;
 public class UserHandleServiceImpl extends ServiceImpl<UserHandleMapper, UserHandle> implements IUserHandleService {
 
     @Override
-    public List<UserHandleVo> queryUserHandleList(UserHandleQueryBo bo) {
+    public List<UserHandle> queryUserHandleList(UserHandleQueryBo bo) {
         List<UserHandle> list = list(new LambdaQueryWrapper<UserHandle>()
                 .eq(UserHandle::getStatus, 1)
                 .eq(UserHandle::getUserId,bo.getUserId())
@@ -43,7 +43,7 @@ public class UserHandleServiceImpl extends ServiceImpl<UserHandleMapper, UserHan
         if (CollectionUtils.isEmpty(list)){
             return new ArrayList<>();
         }
-        return list.stream().map(item -> BeanUtil.toBean(item,UserHandleVo.class)).collect(Collectors.toList());
+        return list;
     }
 
     @Override