Commit 83dc7f8a authored by zhengjie's avatar zhengjie
Browse files

优化user列表中的岗位DTO,修改@author信息,新增验证码登录

parent c01435a0
...@@ -7,7 +7,7 @@ import java.util.List; ...@@ -7,7 +7,7 @@ import java.util.List;
import java.util.Set; import java.util.Set;
/** /**
* @author jie * @author Zheng Jie
* @date 2018-12-17 * @date 2018-12-17
*/ */
@Data @Data
......
...@@ -7,7 +7,7 @@ import java.sql.Timestamp; ...@@ -7,7 +7,7 @@ import java.sql.Timestamp;
import java.util.List; import java.util.List;
/** /**
* @author jie * @author Zheng Jie
* @date 2018-12-03 * @date 2018-12-03
*/ */
@Data @Data
......
...@@ -6,7 +6,7 @@ import java.sql.Timestamp; ...@@ -6,7 +6,7 @@ import java.sql.Timestamp;
import java.util.Set; import java.util.Set;
/** /**
* @author jie * @author Zheng Jie
* @date 2018-11-23 * @date 2018-11-23
*/ */
@Data @Data
......
...@@ -7,7 +7,7 @@ import java.sql.Timestamp; ...@@ -7,7 +7,7 @@ import java.sql.Timestamp;
import java.util.Set; import java.util.Set;
/** /**
* @author jie * @author Zheng Jie
* @date 2018-11-23 * @date 2018-11-23
*/ */
@Data @Data
......
...@@ -9,7 +9,7 @@ import java.util.Date; ...@@ -9,7 +9,7 @@ import java.util.Date;
import java.util.Set; import java.util.Set;
/** /**
* @author jie * @author Zheng Jie
* @date 2018-11-23 * @date 2018-11-23
*/ */
@Data @Data
...@@ -39,9 +39,9 @@ public class UserDTO implements Serializable { ...@@ -39,9 +39,9 @@ public class UserDTO implements Serializable {
private Set<RoleSmallDTO> roles; private Set<RoleSmallDTO> roles;
@ApiModelProperty(hidden = true) @ApiModelProperty(hidden = true)
private JobDTO job; private JobSmallDTO job;
private DeptDTO dept; private DeptSmallDTO dept;
private Long deptId; private Long deptId;
} }
...@@ -6,7 +6,7 @@ import java.io.Serializable; ...@@ -6,7 +6,7 @@ import java.io.Serializable;
import java.util.Set; import java.util.Set;
/** /**
* @author jie * @author Zheng Jie
* @date 2018-11-23 * @date 2018-11-23
*/ */
@Data @Data
......
...@@ -18,7 +18,7 @@ import java.util.*; ...@@ -18,7 +18,7 @@ import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
* @author jie * @author Zheng Jie
* @date 2019-03-25 * @date 2019-03-25
*/ */
@Service @Service
......
...@@ -18,7 +18,7 @@ import org.springframework.transaction.annotation.Transactional; ...@@ -18,7 +18,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.Optional; import java.util.Optional;
/** /**
* @author jie * @author Zheng Jie
* @date 2019-04-10 * @date 2019-04-10
*/ */
@Service @Service
......
...@@ -17,7 +17,7 @@ import org.springframework.transaction.annotation.Transactional; ...@@ -17,7 +17,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.Optional; import java.util.Optional;
/** /**
* @author jie * @author Zheng Jie
* @date 2019-04-10 * @date 2019-04-10
*/ */
@Service @Service
......
...@@ -21,7 +21,7 @@ import java.util.List; ...@@ -21,7 +21,7 @@ import java.util.List;
import java.util.Optional; import java.util.Optional;
/** /**
* @author jie * @author Zheng Jie
* @date 2019-03-29 * @date 2019-03-29
*/ */
@Service @Service
......
...@@ -17,7 +17,7 @@ import org.springframework.transaction.annotation.Transactional; ...@@ -17,7 +17,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.*; import java.util.*;
/** /**
* @author jie * @author Zheng Jie
* @date 2018-12-03 * @date 2018-12-03
*/ */
@Service @Service
......
...@@ -23,7 +23,7 @@ import java.util.*; ...@@ -23,7 +23,7 @@ import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
* @author jie * @author Zheng Jie
* @date 2018-12-03 * @date 2018-12-03
*/ */
@Service @Service
......
...@@ -22,7 +22,7 @@ import java.util.Date; ...@@ -22,7 +22,7 @@ import java.util.Date;
import java.util.Optional; import java.util.Optional;
/** /**
* @author jie * @author Zheng Jie
* @date 2018-11-23 * @date 2018-11-23
*/ */
@Service @Service
......
...@@ -7,7 +7,7 @@ import org.mapstruct.Mapper; ...@@ -7,7 +7,7 @@ import org.mapstruct.Mapper;
import org.mapstruct.ReportingPolicy; import org.mapstruct.ReportingPolicy;
/** /**
* @author jie * @author Zheng Jie
* @date 2019-03-25 * @date 2019-03-25
*/ */
@Mapper(componentModel = "spring",uses = {},unmappedTargetPolicy = ReportingPolicy.IGNORE) @Mapper(componentModel = "spring",uses = {},unmappedTargetPolicy = ReportingPolicy.IGNORE)
......
package me.zhengjie.modules.system.service.mapper;
import me.zhengjie.mapper.EntityMapper;
import me.zhengjie.modules.system.domain.Dept;
import me.zhengjie.modules.system.service.dto.DeptSmallDTO;
import org.mapstruct.Mapper;
import org.mapstruct.ReportingPolicy;
/**
* @author Zheng Jie
* @date 2019-03-25
*/
@Mapper(componentModel = "spring",uses = {},unmappedTargetPolicy = ReportingPolicy.IGNORE)
public interface DeptSmallMapper extends EntityMapper<DeptSmallDTO, Dept> {
}
\ No newline at end of file
...@@ -7,7 +7,7 @@ import org.mapstruct.Mapper; ...@@ -7,7 +7,7 @@ import org.mapstruct.Mapper;
import org.mapstruct.ReportingPolicy; import org.mapstruct.ReportingPolicy;
/** /**
* @author jie * @author Zheng Jie
* @date 2019-04-10 * @date 2019-04-10
*/ */
@Mapper(componentModel = "spring",uses = {},unmappedTargetPolicy = ReportingPolicy.IGNORE) @Mapper(componentModel = "spring",uses = {},unmappedTargetPolicy = ReportingPolicy.IGNORE)
......
...@@ -7,7 +7,7 @@ import org.mapstruct.Mapper; ...@@ -7,7 +7,7 @@ import org.mapstruct.Mapper;
import org.mapstruct.ReportingPolicy; import org.mapstruct.ReportingPolicy;
/** /**
* @author jie * @author Zheng Jie
* @date 2019-04-10 * @date 2019-04-10
*/ */
@Mapper(componentModel = "spring",uses = {},unmappedTargetPolicy = ReportingPolicy.IGNORE) @Mapper(componentModel = "spring",uses = {},unmappedTargetPolicy = ReportingPolicy.IGNORE)
......
...@@ -8,7 +8,7 @@ import org.mapstruct.Mapping; ...@@ -8,7 +8,7 @@ import org.mapstruct.Mapping;
import org.mapstruct.ReportingPolicy; import org.mapstruct.ReportingPolicy;
/** /**
* @author jie * @author Zheng Jie
* @date 2019-03-29 * @date 2019-03-29
*/ */
@Mapper(componentModel = "spring",uses = {DeptMapper.class},unmappedTargetPolicy = ReportingPolicy.IGNORE) @Mapper(componentModel = "spring",uses = {DeptMapper.class},unmappedTargetPolicy = ReportingPolicy.IGNORE)
......
package me.zhengjie.modules.system.service.mapper;
import me.zhengjie.mapper.EntityMapper;
import me.zhengjie.modules.system.domain.Job;
import me.zhengjie.modules.system.service.dto.JobSmallDTO;
import org.mapstruct.Mapper;
import org.mapstruct.ReportingPolicy;
/**
* @author Zheng Jie
* @date 2019-03-29
*/
@Mapper(componentModel = "spring",uses = {},unmappedTargetPolicy = ReportingPolicy.IGNORE)
public interface JobSmallMapper extends EntityMapper<JobSmallDTO, Job> {
}
\ No newline at end of file
...@@ -7,7 +7,7 @@ import org.mapstruct.Mapper; ...@@ -7,7 +7,7 @@ import org.mapstruct.Mapper;
import org.mapstruct.ReportingPolicy; import org.mapstruct.ReportingPolicy;
/** /**
* @author jie * @author Zheng Jie
* @date 2018-12-17 * @date 2018-12-17
*/ */
@Mapper(componentModel = "spring",uses = {},unmappedTargetPolicy = ReportingPolicy.IGNORE) @Mapper(componentModel = "spring",uses = {},unmappedTargetPolicy = ReportingPolicy.IGNORE)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment