suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

问题修复

Browse Source
This commit is contained in:
zhangchenbiao
2023-07-20 09:43:51 +08:00
parent 368e4757c3
commit 5a74bb43c7
12 changed files with 44 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coolstore-partner-model/src/main/java/com/cool/store/dto/enterprise/EnterpriseUserDTO.java
View File

@@ -34,7 +34,7 @@ public class EnterpriseUserDTO implements Serializable {
private String remark;
@ApiModelProperty("用户主键id")
private String id;
private Long id;
@ApiModelProperty("钉钉用户id")
private String userId;
@@ -106,7 +106,6 @@ public class EnterpriseUserDTO implements Serializable {
List<EnterpriseUserDO> resultList = new ArrayList<>();
for (EnterpriseUserDTO user : userList) {
EnterpriseUserDO enterpriseUserDO = new EnterpriseUserDO();
enterpriseUserDO.setId(UUIDUtils.get32UUID());
enterpriseUserDO.setUserId(user.getUserId());
enterpriseUserDO.setName(user.getName());
enterpriseUserDO.setRemark(user.getRemark());
@@ -155,7 +154,6 @@ public class EnterpriseUserDTO implements Serializable {
public static EnterpriseUserDO transUserDtoToDo(EnterpriseUserDTO user, Map<String, String> regionPathMap, Multimap<String, String> leaderDeptMap, FSEventTypeEnum eventType) {
EnterpriseUserDO enterpriseUserDO = new EnterpriseUserDO();
enterpriseUserDO.setId(UUIDUtils.get32UUID());
enterpriseUserDO.setUserId(user.getUserId());
enterpriseUserDO.setName(user.getName());
enterpriseUserDO.setRemark(user.getRemark());

12
coolstore-partner-model/src/main/java/com/cool/store/dto/enterprise/SysDepartmentDTO.java
View File

@@ -205,8 +205,8 @@ public class SysDepartmentDTO {
region.setLeaderUserId(dept.getLeaderUserId());
region.setOrderNum(dept.getDepartOrder());
region.setThirdDeptId(dept.getId());
region.setCreateTime(System.currentTimeMillis());
region.setUpdateTime(System.currentTimeMillis());
region.setCreateTime(new Date());
region.setUpdateTime(new Date());
List<String> pathIds = new ArrayList<>();
pathIds.add(region.getRegionId());
String parentId = parentMap.get(region.getRegionId());
@@ -238,8 +238,8 @@ public class SysDepartmentDTO {
region.setLeaderUserId(dept.getLeaderUserId());
region.setOrderNum(dept.getDepartOrder());
region.setThirdDeptId(dept.getId());
region.setCreateTime(System.currentTimeMillis());
region.setUpdateTime(System.currentTimeMillis());
region.setCreateTime(new Date());
region.setUpdateTime(new Date());
String regionPath = parentRegion.getRegionPath() + region.getRegionId() + CommonConstants.PATH_SPILT;
region.setRegionPath(regionPath);
region.setDeleted(Boolean.FALSE);
@@ -260,8 +260,8 @@ public class SysDepartmentDTO {
region.setLeaderUserId(dept.getLeaderUserId());
region.setOrderNum(dept.getDepartOrder());
region.setThirdDeptId(dept.getId());
region.setCreateTime(System.currentTimeMillis());
region.setUpdateTime(System.currentTimeMillis());
region.setCreateTime(new Date());
region.setUpdateTime(new Date());
region.setDeleted(Boolean.FALSE);
if(CollectionUtils.isNotEmpty(dept.getDeptManagerUseridList())){
for (String leader : dept.getDeptManagerUseridList()) {

2
coolstore-partner-model/src/main/java/com/cool/store/entity/EnterpriseUserDO.java
View File

@@ -19,7 +19,7 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor
public class EnterpriseUserDO implements Serializable {
@ApiModelProperty("用户主键id")
private String id;
private Long id;
@ApiModelProperty("用户id")
private String userId;

6
coolstore-partner-model/src/main/java/com/cool/store/entity/RegionDO.java
View File

@@ -2,6 +2,8 @@ package com.cool.store.entity;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@@ -45,13 +47,13 @@ public class RegionDO implements Serializable {
private String thirdDeptId;
@ApiModelProperty("创建时间")
private Long createTime;
private Date createTime;
@ApiModelProperty("创建人")
private String createName;
@ApiModelProperty("更新时间")
private Long updateTime;
private Date updateTime;
@ApiModelProperty("更新人")
private String updateName;