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 10:31:22 +08:00
parent 9b52bad406
commit 476bcf0a89
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coolstore-partner-dao/src/main/resources/mapper/UserRegionMappingMapper.xml
View File

@@ -8,9 +8,9 @@
<result column="type" jdbcType="INTEGER" property="type"/> <result column="type" jdbcType="INTEGER" property="type"/>
<result column="deleted" jdbcType="BIT" property="deleted"/> <result column="deleted" jdbcType="BIT" property="deleted"/>
<result column="create_id" jdbcType="VARCHAR" property="createId"/> <result column="create_id" jdbcType="VARCHAR" property="createId"/>
<result column="create_time" jdbcType="BIGINT" property="createTime"/> <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
<result column="update_id" jdbcType="VARCHAR" property="updateId"/> <result column="update_id" jdbcType="VARCHAR" property="updateId"/>
<result column="update_time" jdbcType="BIGINT" property="updateTime"/> <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id, region_id, user_id, type, deleted, create_id, create_time, update_id, update_time id, region_id, user_id, type, deleted, create_id, create_time, update_id, update_time

17
coolstore-partner-model/src/main/java/com/cool/store/entity/UserRegionMappingDO.java
View File

@@ -8,6 +8,7 @@ import com.google.common.collect.Lists;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable; import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@@ -47,13 +48,13 @@ public class UserRegionMappingDO implements Serializable {
private String createId; private String createId;
@ApiModelProperty("创建时间") @ApiModelProperty("创建时间")
private Long createTime; private Date createTime;
@ApiModelProperty("更新人") @ApiModelProperty("更新人")
private String updateId; private String updateId;
@ApiModelProperty("更新时间") @ApiModelProperty("更新时间")
private Long updateTime; private Date updateTime;
public static List<UserRegionMappingDO> convertSyncDO(String regionId, List<EnterpriseUserDTO> departmentUsers){ public static List<UserRegionMappingDO> convertSyncDO(String regionId, List<EnterpriseUserDTO> departmentUsers){
if(CollectionUtils.isEmpty(departmentUsers)){ if(CollectionUtils.isEmpty(departmentUsers)){
@@ -65,8 +66,8 @@ public class UserRegionMappingDO implements Serializable {
userRegion.setRegionId(regionId); userRegion.setRegionId(regionId);
userRegion.setUserId(departmentUser.getUserId()); userRegion.setUserId(departmentUser.getUserId());
userRegion.setType(DataSourceEnum.SYNC.getCode()); userRegion.setType(DataSourceEnum.SYNC.getCode());
userRegion.setCreateTime(System.currentTimeMillis()); userRegion.setCreateTime(new Date());
userRegion.setUpdateTime(System.currentTimeMillis()); userRegion.setUpdateTime(new Date());
userRegion.setDeleted(Boolean.FALSE); userRegion.setDeleted(Boolean.FALSE);
resultList.add(userRegion); resultList.add(userRegion);
} }
@@ -83,8 +84,8 @@ public class UserRegionMappingDO implements Serializable {
userRegion.setRegionId(regionId); userRegion.setRegionId(regionId);
userRegion.setUserId(userId); userRegion.setUserId(userId);
userRegion.setType(DataSourceEnum.SYNC.getCode()); userRegion.setType(DataSourceEnum.SYNC.getCode());
userRegion.setCreateTime(System.currentTimeMillis()); userRegion.setCreateTime(new Date());
userRegion.setUpdateTime(System.currentTimeMillis()); userRegion.setUpdateTime(new Date());
userRegion.setDeleted(Boolean.FALSE); userRegion.setDeleted(Boolean.FALSE);
resultList.add(userRegion); resultList.add(userRegion);
} }
@@ -111,8 +112,8 @@ public class UserRegionMappingDO implements Serializable {
userRegion.setRegionId(split[split.length-1]); userRegion.setRegionId(split[split.length-1]);
userRegion.setUserId(user.getUserId()); userRegion.setUserId(user.getUserId());
userRegion.setType(DataSourceEnum.SYNC.getCode()); userRegion.setType(DataSourceEnum.SYNC.getCode());
userRegion.setCreateTime(System.currentTimeMillis()); userRegion.setCreateTime(new Date());
userRegion.setUpdateTime(System.currentTimeMillis()); userRegion.setUpdateTime(new Date());
userRegion.setDeleted(Boolean.FALSE); userRegion.setDeleted(Boolean.FALSE);
resultList.add(userRegion); resultList.add(userRegion);
} }

1
coolstore-partner-service/src/main/java/com/cool/store/service/impl/LoginServiceImpl.java
View File

@@ -52,7 +52,6 @@ public class LoginServiceImpl implements LoginService {
throw new ServiceException(ErrorCodeEnum.USER_NOT_EXIST); throw new ServiceException(ErrorCodeEnum.USER_NOT_EXIST);
} }
LoginUserInfo currentUser = new LoginUserInfo(); LoginUserInfo currentUser = new LoginUserInfo();
RefreshUser refreshUser = new RefreshUser();
// 查企业用户 // 查企业用户
EnterpriseUserDO enterpriseUser = enterpriseUserDAO.getUserInfoById(userId); EnterpriseUserDO enterpriseUser = enterpriseUserDAO.getUserInfoById(userId);
if(enterpriseUser == null){ if(enterpriseUser == null){