Prechádzať zdrojové kódy

处理岗位中精度丢失

buzhanyi 1 rok pred
rodič
commit
d6ba2b6623

+ 2 - 2
application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/controller/SysUserController.java

@@ -188,8 +188,8 @@ public class SysUserController {
             PageMethod.startPage(sysUserDtoFilter.getPageNum(), sysUserDtoFilter.getPageSize());
         }
         SysUser sysUserFilter = MyModelUtil.copyTo(sysUserDtoFilter, SysUser.class);
-        List<SysUser> sysUserList = sysUserService.getSysUserListWithRelation(sysUserFilter);
-        return ResMsg.newInstance(CodeEnum.OK, MyPageUtil.makeResponseData(sysUserList, SysUser.INSTANCE));
+        List<SysUserVo> sysUserList = sysUserService.getSysUserListWithRelation(sysUserFilter);
+        return ResMsg.newInstance(CodeEnum.OK, MyPageUtil.makeResponseData(sysUserList));
     }
 
     /**

+ 2 - 1
application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/service/SysUserService.java

@@ -4,6 +4,7 @@ import com.ankaibei.workFlow.webadmin.ankaibei.entity.UserInfoEntity;
 import com.ankaibei.workFlow.webadmin.upms.model.*;
 import com.ankaibei.workFlow.common.core.object.CallResult;
 import com.ankaibei.workFlow.common.core.base.service.IBaseService;
+import com.ankaibei.workFlow.webadmin.upms.vo.SysUserVo;
 
 import java.util.*;
 
@@ -90,7 +91,7 @@ public interface SysUserService extends IBaseService<SysUser, String> {
      * @param filter 主表过滤对象。
      * @return 查询结果集。
      */
-    List<SysUser> getSysUserListWithRelation(SysUser filter);
+    List<SysUserVo> getSysUserListWithRelation(SysUser filter);
 
     /**
      * 获取指定角色的用户列表。

+ 16 - 4
application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/service/impl/SysUserServiceImpl.java

@@ -3,6 +3,7 @@ package com.ankaibei.workFlow.webadmin.upms.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.ankaibei.workFlow.webadmin.upms.vo.SysUserVo;
 import com.baomidou.mybatisplus.core.conditions.query.*;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.ankaibei.workFlow.webadmin.upms.service.*;
@@ -18,6 +19,7 @@ import com.ankaibei.workFlow.common.core.util.MyModelUtil;
 import com.ankaibei.workFlow.common.sequence.wrapper.IdGeneratorWrapper;
 import com.github.pagehelper.Page;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -259,12 +261,22 @@ public class SysUserServiceImpl extends BaseService<SysUser, String> implements
      * @return 查询结果集。
      */
     @Override
-    public List<SysUser> getSysUserListWithRelation(SysUser filter) {
-        List<SysUser> resultList = sysUserMapper.getSysUserList(filter);
+    public List<SysUserVo> getSysUserListWithRelation(SysUser filter) {
+        List<SysUser> list = sysUserMapper.getSysUserList(filter);
+        List<SysUserVo> resultList = new ArrayList<>();
         // 在缺省生成的代码中,如果查询结果resultList不是Page对象,说明没有分页,那么就很可能是数据导出接口调用了当前方法。
         // 为了避免一次性的大量数据关联,规避因此而造成的系统运行性能冲击,这里手动进行了分批次读取,开发者可按需修改该值。
-        int batchSize = resultList instanceof Page ? 0 : 1000;
-        this.buildRelationForDataList(resultList, MyRelationParam.normal(), batchSize);
+        int batchSize = list instanceof Page ? 0 : 1000;
+        this.buildRelationForDataList(list, MyRelationParam.normal(), batchSize);
+        for (SysUser user : list) {
+            SysUserVo userVo = new SysUserVo();
+            BeanUtils.copyProperties(user, userVo);
+            userVo.setUserId(user.getUserId() + "");
+            userVo.setDeptId(user.getDeptId() + "");
+            userVo.setCreateUserId(user.getCreateUserId() + "");
+            userVo.setUpdateUserId(user.getUpdateUserId() + "");
+            resultList.add(userVo);
+        }
         return resultList;
     }
 

+ 5 - 3
application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/vo/SysUserVo.java

@@ -41,7 +41,7 @@ public class SysUserVo {
      * 用户部门Id。
      */
     @ApiModelProperty(value = "用户部门Id")
-    private Long deptId;
+    private String deptId;
 
     /**
      * 用户类型(0: 管理员 1: 系统管理用户 2: 系统业务用户)。
@@ -89,13 +89,13 @@ public class SysUserVo {
      * 创建者Id。
      */
     @ApiModelProperty(value = "创建者Id")
-    private Long createUserId;
+    private String createUserId;
 
     /**
      * 更新者Id。
      */
     @ApiModelProperty(value = "更新者Id")
-    private Long updateUserId;
+    private String updateUserId;
 
     /**
      * 创建时间。
@@ -144,4 +144,6 @@ public class SysUserVo {
      */
     @ApiModelProperty(value = "userStatus 常量字典关联数据")
     private Map<String, Object> userStatusDictMap;
+
+
 }