From eec83608ce34d4027b4d4cf2eb18d8e04a653fce Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Tue, 18 Aug 2020 18:31:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ResultRecordController.java | 101 ++++++++++++++++-- .../lz/modules/app/entity/StaffEntity.java | 5 +- .../lz/modules/app/req/ResultRecordReq.java | 4 +- .../lz/modules/app/resp/ResultDetailResp.java | 2 + .../DepartmentsStaffRelateServiceImpl.java | 2 +- .../app/service/impl/StaffServiceImpl.java | 1 - .../lz/modules/flow/dao/RecordAuthMapper.java | 5 + .../lz/modules/flow/entity/RecordAuth.java | 12 +-- .../java/com/lz/modules/flow/model/Auth.java | 21 ++++ .../flow/service/RecordAuthService.java | 6 +- .../service/impl/RecordAuthServiceImpl.java | 13 +-- .../sys/controller/SysLoginController.java | 2 + .../sys/controller/SysMenuController.java | 2 +- .../lz/modules/sys/dao/SysUserTokenDao.java | 1 + .../lz/modules/sys/oauth2/OAuth2Realm.java | 1 + .../sys/service/app/ResultRecordService.java | 3 +- .../app/impl/ResultRecordServiceImpl.java | 61 ++++++----- .../sys/service/impl/ShiroServiceImpl.java | 2 +- .../service/impl/SysUserTokenServiceImpl.java | 7 +- .../mapper/flow/RecordAuthMapper.xml | 9 ++ src/main/resources/mapper/sys/SysUserDao.xml | 3 + .../resources/mapper/sys/SysUserTokenDao.xml | 20 +++- 22 files changed, 215 insertions(+), 68 deletions(-) create mode 100644 src/main/java/com/lz/modules/flow/model/Auth.java diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java index 66837d4b..b24f48d9 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -10,6 +10,11 @@ import com.lz.modules.app.resp.ResultDetailResp; import com.lz.modules.app.service.DepartmentsService; import com.lz.modules.app.service.DepartmentsStaffRelateService; import com.lz.modules.app.service.StaffService; +import com.lz.modules.flow.entity.RecordAuth; +import com.lz.modules.flow.model.Auth; +import com.lz.modules.flow.service.RecordAuthService; +import com.lz.modules.sys.controller.AbstractController; +import com.lz.modules.sys.entity.SysUserEntity; import com.lz.modules.sys.entity.app.ResultDetail; import com.lz.modules.sys.entity.app.ResultRecord; import com.lz.modules.sys.service.app.ResultDetailService; @@ -26,10 +31,7 @@ import org.springframework.web.bind.annotation.RestController; import java.math.BigDecimal; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; @@ -42,7 +44,7 @@ import java.util.stream.Collectors; */ @RestController @RequestMapping("user/lzresultrecord") -public class ResultRecordController { +public class ResultRecordController extends AbstractController { @Autowired private ResultRecordService lzResultRecordService; @Autowired @@ -59,13 +61,19 @@ public class ResultRecordController { @Autowired private DepartmentsStaffRelateService departmentsStaffRelateService; + @Autowired + private RecordAuthService recordAuthService; + + + /** * 列表 */ @RequestMapping("/list") @RequiresPermissions("user:lzresultrecord:list") public R list(ResultRecordReq req) { - PageUtils page = lzResultRecordService.queryPage(req); + SysUserEntity user = getUser(); + PageUtils page = lzResultRecordService.queryPage(req,user); List departmentList1 = departmentsService.selectByParentDepartmentId("0"); return R.ok().put("page", page) .put("departmentList1", departmentList1); @@ -81,19 +89,32 @@ public class ResultRecordController { @RequestMapping("/getStaffResultDetail") public R getStaffResultDetail(ResultRecordReq req) { ResultRecord resultRecord = resultRecordService.selectResultRecordById(req.getRecordResultId()); - StaffEntity staffEntity = staffService.getById(resultRecord.getStaffId()); + StaffEntity staffEntity = staffService.getById(resultRecord != null ? resultRecord.getStaffId() : getUserId()); List departmentsStaffRelateEntities = departmentsStaffRelateService.selectByStaffIds(Arrays.asList(staffEntity.getId())); DepartmentsStaffRelateEntity departmentsStaffRelateEntity = departmentsStaffRelateEntities.get(0); StaffDepartmentDto departmentDto = departmentsService.selectStaffAllDepartments(departmentsStaffRelateEntity.getDepartmentId()); List resultDetails = resultDetailService.selectByRecordId(req.getRecordResultId()); SimpleDateFormat sdf3 = new SimpleDateFormat("yyyy年MM月dd"); List list = new ArrayList<>(); + int firstRowspan = 0; int secondRowspan = 0; int threeRowspan = 0; int fourRowspan = 0; int fiveRowspan = 0; + // 获取权限 + List map = new ArrayList<>(); + Long authId = 0l; + if(req.getType() == 1){ //目标新增 + map = recordAuthService.selectAuthInfo(7l); + authId = 7l; + }else if(req.getType() == 2){ //业绩编辑 + map = recordAuthService.selectAuthInfo(8l); + authId = 8l; + } + + Auth auth = getAuth(map); if (!Collections.isEmpty(resultDetails)) { Map details = resultDetails.stream().collect(Collectors.groupingBy(ResultDetail::getType, Collectors.counting())); int type1 = NumberUtil.objToIntDefault(details.get(new Integer(1)), 0); @@ -103,7 +124,6 @@ public class ResultRecordController { threeRowspan = type1 + 1 + type2; fourRowspan = type1 + 1 + type2 + 1; fiveRowspan = type1 + 1 + type2 + 2; - int count = 0; for (ResultDetail resultDetail : resultDetails) { count++; @@ -130,8 +150,43 @@ public class ResultRecordController { } list.add(resp); } - } + }else{ + int type1 = 1; + int type2 = 2; + firstRowspan = type1; + secondRowspan = type1 + 1; + threeRowspan = type1 + 1 + type2; + fourRowspan = type1 + 1 + type2 + 1; + fiveRowspan = type1 + 1 + type2 + 2; + ResultDetailResp result = new ResultDetailResp(); + result.setCheckRange("业绩"); + result.setCheckWeight(new BigDecimal(0.7)); + result.setIsAdd(1); + result.setIsEdit(1); + list.add(result); + + ResultDetailResp respHeader = new ResultDetailResp(); + respHeader.setKeyResult("业务考核结果"); + respHeader.setCheckWeight(new BigDecimal(0.7)); + respHeader.setSuperScore("/"); + respHeader.setAcquireScore(new BigDecimal(0)); + respHeader.setScoreComment("/"); + respHeader.setIsAdd(-1); + list.add(respHeader); + + ResultDetailResp wenhua1 = new ResultDetailResp(); + wenhua1.setCheckRange("文化价值观"); + wenhua1.setTarget("做人：相信、包容、担当"); + wenhua1.setCheckWeight(new BigDecimal(0.15)); + list.add(wenhua1); + + ResultDetailResp wenhua2 = new ResultDetailResp(); + wenhua2.setCheckRange("文化价值观"); + wenhua2.setTarget("做人：相信、包容、担当"); + wenhua2.setCheckWeight(new BigDecimal(0.15)); + list.add(wenhua2); + } ResultDetailResp tail1 = new ResultDetailResp(); tail1.setKeyResult("文化价值观考核结果"); tail1.setCheckWeight(new BigDecimal(0.3)); @@ -161,14 +216,38 @@ public class ResultRecordController { .put("department1", departmentDto.getDepartment1()) .put("department2", departmentDto.getDepartment2()) .put("department3", departmentDto.getDepartment3()) - .put("checkMonth", sdf3.format(resultRecord.getGmtCreate())) + .put("checkMonth", sdf3.format(resultRecord == null ? new Date() : resultRecord.getGmtCreate())) .put("firstRowspan", firstRowspan) .put("secondRowspan", secondRowspan) .put("threeRowspan", threeRowspan) .put("fourRowspan", fourRowspan) .put("fiveRowspan", fiveRowspan) - .put("list", list); + .put("list", list) + .put("auth",auth) + .put("authId",authId); + } + + public Auth getAuth(List auths) { + Map map = new HashMap<>(); + if (CollectionUtils.isNotEmpty(auths)) { + map = auths.stream().collect(Collectors.toMap(RecordAuth::getIdentity, RecordAuth::getStatus)); + } + Auth auth = new Auth(); + auth.setAdd(NumberUtil.objToIntDefault(map.get("add"),0)); + auth.setApprovel(NumberUtil.objToIntDefault(map.get("approvel"),0)); + auth.setCheckResult(NumberUtil.objToIntDefault(map.get("checkResult"),0)); + auth.setCheckWeight(NumberUtil.objToIntDefault(map.get("checkWeight"),0)); + auth.setCommit(NumberUtil.objToIntDefault(map.get("commit"),0)); + auth.setConfirmCommit(NumberUtil.objToIntDefault(map.get("confirmCommit"),0)); + auth.setKeyResult(NumberUtil.objToIntDefault(map.get("keyResult"),0)); + auth.setPriority(NumberUtil.objToIntDefault(map.get("priority"),0)); + auth.setReject(NumberUtil.objToIntDefault(map.get("reject"),0)); + auth.setScoreComment(NumberUtil.objToIntDefault(map.get("scoreComment"),0)); + auth.setSuperScore(NumberUtil.objToIntDefault(map.get("superScore"),0)); + auth.setTarget(NumberUtil.objToIntDefault(map.get("target"),0)); + auth.setEdit(NumberUtil.objToIntDefault(map.get("edit"),0)); + return auth; } /** diff --git a/src/main/java/com/lz/modules/app/entity/StaffEntity.java b/src/main/java/com/lz/modules/app/entity/StaffEntity.java index feeac7ff..c04b2820 100644 --- a/src/main/java/com/lz/modules/app/entity/StaffEntity.java +++ b/src/main/java/com/lz/modules/app/entity/StaffEntity.java @@ -100,10 +100,7 @@ public class StaffEntity implements Serializable { * 飞书用户的union_id */ private String unionId; - /*** - * 是否为部门领导 0不是 1是 - */ - private Integer isLeader; + /** * 头像url */ diff --git a/src/main/java/com/lz/modules/app/req/ResultRecordReq.java b/src/main/java/com/lz/modules/app/req/ResultRecordReq.java index b830f388..ce09f0aa 100644 --- a/src/main/java/com/lz/modules/app/req/ResultRecordReq.java +++ b/src/main/java/com/lz/modules/app/req/ResultRecordReq.java @@ -28,6 +28,6 @@ public class ResultRecordReq { private BigDecimal weight = new BigDecimal(0); private Integer type; private Long id = new Long (0); - - + private Integer isSelf = 1; + private Long staffId; } diff --git a/src/main/java/com/lz/modules/app/resp/ResultDetailResp.java b/src/main/java/com/lz/modules/app/resp/ResultDetailResp.java index 3902c412..a005ea43 100644 --- a/src/main/java/com/lz/modules/app/resp/ResultDetailResp.java +++ b/src/main/java/com/lz/modules/app/resp/ResultDetailResp.java @@ -41,4 +41,6 @@ public class ResultDetailResp { private Integer priority; private int isAdd; + + private int isEdit; } diff --git a/src/main/java/com/lz/modules/app/service/impl/DepartmentsStaffRelateServiceImpl.java b/src/main/java/com/lz/modules/app/service/impl/DepartmentsStaffRelateServiceImpl.java index bf13d743..e726ea4e 100644 --- a/src/main/java/com/lz/modules/app/service/impl/DepartmentsStaffRelateServiceImpl.java +++ b/src/main/java/com/lz/modules/app/service/impl/DepartmentsStaffRelateServiceImpl.java @@ -45,7 +45,7 @@ public class DepartmentsStaffRelateServiceImpl extends ServiceImpl impleme staffEntity.setOpenId(staffBo.getOpenId()); staffEntity.setEmployeeId(staffBo.getEmployeeId()); staffEntity.setUnionId(staffBo.getUnionId()); - staffEntity.setIsLeader(staffBo.getIsLeader()); staffEntity.setAvatar(staffBo.getAvatar()); staffEntity.setJobNumber(staffBo.getEmployeeNo()); return staffEntity; diff --git a/src/main/java/com/lz/modules/flow/dao/RecordAuthMapper.java b/src/main/java/com/lz/modules/flow/dao/RecordAuthMapper.java index 0e4f58b8..b937fadf 100644 --- a/src/main/java/com/lz/modules/flow/dao/RecordAuthMapper.java +++ b/src/main/java/com/lz/modules/flow/dao/RecordAuthMapper.java @@ -11,6 +11,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.lz.modules.flow.entity.RecordAuth; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + @Mapper public interface RecordAuthMapper extends BaseMapper { @@ -30,4 +34,5 @@ public interface RecordAuthMapper extends BaseMapper { int deleteRecordAuthById(@Param("id")Long id); + List selectAuthInfo(@Param("roleId") Long roleId); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/entity/RecordAuth.java b/src/main/java/com/lz/modules/flow/entity/RecordAuth.java index b425bec7..f6cff98f 100644 --- a/src/main/java/com/lz/modules/flow/entity/RecordAuth.java +++ b/src/main/java/com/lz/modules/flow/entity/RecordAuth.java @@ -29,9 +29,9 @@ public class RecordAuth implements java.io.Serializable { //名称 private String name; // - private Long identity; + private String identity; //0,不可见。1 可见，不可编辑。2 可编辑 - private String status; + private Integer status; /** * * @return @@ -126,14 +126,14 @@ public class RecordAuth implements java.io.Serializable { * * @return */ - public Long getIdentity() { + public String getIdentity() { return identity; } /** * * @param identity */ - public void setIdentity(Long identity) { + public void setIdentity(String identity) { this.identity = identity; } @@ -141,14 +141,14 @@ public class RecordAuth implements java.io.Serializable { * 0,不可见。1 可见，不可编辑。2 可编辑 * @return */ - public String getStatus() { + public Integer getStatus() { return status; } /** * 0,不可见。1 可见，不可编辑。2 可编辑 * @param status */ - public void setStatus(String status) { + public void setStatus(Integer status) { this.status = status; } diff --git a/src/main/java/com/lz/modules/flow/model/Auth.java b/src/main/java/com/lz/modules/flow/model/Auth.java new file mode 100644 index 00000000..f293437a --- /dev/null +++ b/src/main/java/com/lz/modules/flow/model/Auth.java @@ -0,0 +1,21 @@ +package com.lz.modules.flow.model; + +import lombok.Data; + +@Data +public class Auth { + private int add; + private int approvel; + private int checkResult; + private int checkWeight; + private int commit; + private int confirmCommit; + private int edit; + private int keyResult; + private int priority; + private int reject; + private int scoreComment; + private int superScore; + private int target; + +} diff --git a/src/main/java/com/lz/modules/flow/service/RecordAuthService.java b/src/main/java/com/lz/modules/flow/service/RecordAuthService.java index 0c6f21ca..25c0b576 100644 --- a/src/main/java/com/lz/modules/flow/service/RecordAuthService.java +++ b/src/main/java/com/lz/modules/flow/service/RecordAuthService.java @@ -3,6 +3,9 @@ package com.lz.modules.flow.service; import com.baomidou.mybatisplus.extension.service.IService; import com.lz.modules.flow.entity.RecordAuth; +import java.util.List; +import java.util.Map; + /** *

* 审批权限表 服务类 @@ -30,6 +33,5 @@ public interface RecordAuthService extends IService { int deleteRecordAuthById(Long id); - - + List selectAuthInfo(Long roldId); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/impl/RecordAuthServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/RecordAuthServiceImpl.java index d392a5f9..14993bc4 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/RecordAuthServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/RecordAuthServiceImpl.java @@ -7,6 +7,9 @@ import com.lz.modules.flow.service.RecordAuthService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Map; + /** *

* 审批权限表 服务类 @@ -51,17 +54,15 @@ public class RecordAuthServiceImpl extends ServiceImpl selectAuthInfo(Long roleId) { + return recordAuthMapper.selectAuthInfo(roleId); + } } diff --git a/src/main/java/com/lz/modules/sys/controller/SysLoginController.java b/src/main/java/com/lz/modules/sys/controller/SysLoginController.java index 9084b2c7..73cc3977 100644 --- a/src/main/java/com/lz/modules/sys/controller/SysLoginController.java +++ b/src/main/java/com/lz/modules/sys/controller/SysLoginController.java @@ -177,12 +177,14 @@ public class SysLoginController extends AbstractController { if (user == null) { StaffEntity staffEntity = staffService.selectByPhone(form.getUserName()); if(staffEntity != null){ + user = new SysUserEntity(); user.setPassword(staffEntity.getPassword()); user.setMobile(staffEntity.getMobile()); user.setUserId(staffEntity.getId()); user.setEmail(staffEntity.getEmail()); user.setSalt(staffEntity.getSalt()); user.setStatus(1); + user.setType(1); user.setRealName(staffEntity.getName()); user.setUserNo(staffEntity.getMobile()); }else{ diff --git a/src/main/java/com/lz/modules/sys/controller/SysMenuController.java b/src/main/java/com/lz/modules/sys/controller/SysMenuController.java index 47b2690c..7e9ec9e0 100644 --- a/src/main/java/com/lz/modules/sys/controller/SysMenuController.java +++ b/src/main/java/com/lz/modules/sys/controller/SysMenuController.java @@ -42,7 +42,7 @@ public class SysMenuController extends AbstractController { */ @GetMapping("/nav") public R nav(){ - List menuList = sysMenuService.getUserMenuList(getUserId()); + List menuList = sysMenuService.getUserMenuList(getUser()); Set permissions = shiroService.getUserPermissions(getUser()); return R.ok().put("menuList", menuList).put("permissions", permissions); } diff --git a/src/main/java/com/lz/modules/sys/dao/SysUserTokenDao.java b/src/main/java/com/lz/modules/sys/dao/SysUserTokenDao.java index e77c10b4..38290580 100644 --- a/src/main/java/com/lz/modules/sys/dao/SysUserTokenDao.java +++ b/src/main/java/com/lz/modules/sys/dao/SysUserTokenDao.java @@ -22,4 +22,5 @@ public interface SysUserTokenDao extends BaseMapper { SysUserTokenEntity queryByToken(String token); + Long insertBySysUserTokenEntity(SysUserTokenEntity tokenEntity); } diff --git a/src/main/java/com/lz/modules/sys/oauth2/OAuth2Realm.java b/src/main/java/com/lz/modules/sys/oauth2/OAuth2Realm.java index d9a261b0..9444261b 100644 --- a/src/main/java/com/lz/modules/sys/oauth2/OAuth2Realm.java +++ b/src/main/java/com/lz/modules/sys/oauth2/OAuth2Realm.java @@ -82,6 +82,7 @@ public class OAuth2Realm extends AuthorizingRealm { user.setEmail(staffEntity.getEmail()); user.setSalt(staffEntity.getSalt()); user.setStatus(1); + user.setType(1); user.setRealName(staffEntity.getName()); user.setUserNo(staffEntity.getMobile()); } diff --git a/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java b/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java index 1867aaa4..2e8a0bee 100644 --- a/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java +++ b/src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java @@ -3,6 +3,7 @@ package com.lz.modules.sys.service.app; import com.baomidou.mybatisplus.extension.service.IService; import com.lz.common.utils.PageUtils; import com.lz.modules.app.req.ResultRecordReq; +import com.lz.modules.sys.entity.SysUserEntity; import com.lz.modules.sys.entity.app.ResultRecord; import java.util.List; @@ -34,7 +35,7 @@ public interface ResultRecordService extends IService { int deleteResultRecordById(Long id); - PageUtils queryPage(ResultRecordReq params); + PageUtils queryPage(ResultRecordReq params, SysUserEntity user); void deleteBatchIds(List asList); diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java index 2a291ba9..aaf6c4fb 100644 --- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java +++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java @@ -16,6 +16,7 @@ import com.lz.modules.app.req.ResultRecordReq; import com.lz.modules.app.resp.ResultRecordResp; import com.lz.modules.app.service.StaffService; import com.lz.modules.sys.dao.app.ResultRecordMapper; +import com.lz.modules.sys.entity.SysUserEntity; import com.lz.modules.sys.entity.app.ResultRecord; import com.lz.modules.sys.service.app.ResultRecordService; import lombok.extern.slf4j.Slf4j; @@ -82,15 +83,13 @@ public class ResultRecordServiceImpl extends ServiceImpl departmentStaffIds = new ArrayList<>(); List staffIds = new ArrayList<>(); List departmentIds = new ArrayList<>(); @@ -124,7 +123,6 @@ public class ResultRecordServiceImpl extends ServiceImpl(setStaffId); } } - if(StringUtil.isNotBlank(params.getName())){ List staffEntities = staffService.selectByName(params.getName()); if(CollectionUtils.isNotEmpty(staffEntities)){ @@ -135,34 +133,39 @@ public class ResultRecordServiceImpl extends ServiceImpl resultRecordMapper.selectByCondition(page, params) - ); + PageUtils pageUtils = null; + if(params.getIsSelf() == 1 ){ // 我的业绩 + params.setStaffId(user.getUserId()); + pageUtils = PageUtils.startPage(params.getPage(), params.getLimit() ).doSelect( + page -> resultRecordMapper.selectByCondition(page, params) + ); + }else{ // 我们审批 + pageUtils = PageUtils.startPage(params.getPage(), params.getLimit() ).doSelect( + page -> resultRecordMapper.selectByCondition(page, params) + ); + } List resultRecords = pageUtils.getList(); - List list = new ArrayList<>(); - - Set viewStaffIdSet = resultRecords.stream().map(p->p.getStaffId()).collect(Collectors.toSet()); - List viewStaffId = new ArrayList<>(viewStaffIdSet); - - List staffEntities = staffService.selectByIds(viewStaffId); - List staffRelateEntities = departmentsStaffRelateDao.selectByStaffIds(viewStaffId); - - Map staffEntityMap = staffEntities.stream().collect(Collectors.toMap(StaffEntity::getId, p -> p)); - Map departmentsEntityMap = tDepartments.stream().collect(Collectors.toMap(p -> p.getDepartmentId(), p -> p)); - - Map staffRelateEntityMap = staffRelateEntities.stream().collect(Collectors.toMap(p -> p.getStaffId(), p -> p)); - - for (ResultRecord resultRecord : resultRecords) { - ResultRecordResp resp = new ResultRecordResp(); - BeanUtils.copyProperties(resultRecord, resp); - resp.setStaffName(staffEntityMap.get(resp.getStaffId()) != null ? staffEntityMap.get(resp.getStaffId()).getName() : ""); - DepartmentsStaffRelateEntity relate = staffRelateEntityMap.get(resp.getStaffId()); - resp.setDepartmentName(relate != null && departmentsEntityMap.get(relate.getDepartmentId()) != null ? - departmentsEntityMap.get(relate.getDepartmentId()).getDepartmentName() : ""); - list.add(resp); + if(CollectionUtils.isNotEmpty(resultRecords)){ + List list = new ArrayList<>(); + Set viewStaffIdSet = resultRecords.stream().map(p->p.getStaffId()).collect(Collectors.toSet()); + List viewStaffId = new ArrayList<>(viewStaffIdSet); + List staffEntities = staffService.selectByIds(viewStaffId); + List staffRelateEntities = departmentsStaffRelateDao.selectByStaffIds(viewStaffId); + Map staffEntityMap = staffEntities.stream().collect(Collectors.toMap(StaffEntity::getId, p -> p)); + Map departmentsEntityMap = tDepartments.stream().collect(Collectors.toMap(p -> p.getDepartmentId(), p -> p)); + Map staffRelateEntityMap = staffRelateEntities.stream().collect(Collectors.toMap(p -> p.getStaffId(), p -> p)); + for (ResultRecord resultRecord : resultRecords) { + ResultRecordResp resp = new ResultRecordResp(); + BeanUtils.copyProperties(resultRecord, resp); + resp.setStaffName(staffEntityMap.get(resp.getStaffId()) != null ? staffEntityMap.get(resp.getStaffId()).getName() : ""); + DepartmentsStaffRelateEntity relate = staffRelateEntityMap.get(resp.getStaffId()); + resp.setDepartmentName(relate != null && departmentsEntityMap.get(relate.getDepartmentId()) != null ? + departmentsEntityMap.get(relate.getDepartmentId()).getDepartmentName() : ""); + list.add(resp); + } + pageUtils.setList(list); } - pageUtils.setList(list); return pageUtils; } diff --git a/src/main/java/com/lz/modules/sys/service/impl/ShiroServiceImpl.java b/src/main/java/com/lz/modules/sys/service/impl/ShiroServiceImpl.java index 093889ec..44d494e6 100644 --- a/src/main/java/com/lz/modules/sys/service/impl/ShiroServiceImpl.java +++ b/src/main/java/com/lz/modules/sys/service/impl/ShiroServiceImpl.java @@ -35,7 +35,7 @@ public class ShiroServiceImpl implements ShiroService { public Set getUserPermissions(SysUserEntity user) { List permsList = null; //系统管理员，拥有最高权限 - if(user.getUserId() == Constant.SUPER_ADMIN || user.getType() == 2){ + if(user.getUserId() == Constant.SUPER_ADMIN || user.getType() == 1){ List menuList = sysMenuDao.selectList(null); permsList = new ArrayList<>(menuList.size()); for(SysMenuEntity menu : menuList){ diff --git a/src/main/java/com/lz/modules/sys/service/impl/SysUserTokenServiceImpl.java b/src/main/java/com/lz/modules/sys/service/impl/SysUserTokenServiceImpl.java index f2bc699a..91914934 100644 --- a/src/main/java/com/lz/modules/sys/service/impl/SysUserTokenServiceImpl.java +++ b/src/main/java/com/lz/modules/sys/service/impl/SysUserTokenServiceImpl.java @@ -15,6 +15,7 @@ import com.lz.modules.sys.oauth2.TokenGenerator; import com.lz.modules.sys.service.SysUserTokenService; import com.lz.common.utils.R; import com.lz.modules.sys.dao.SysUserTokenDao; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Date; @@ -25,6 +26,9 @@ public class SysUserTokenServiceImpl extends ServiceImpl + + + + + diff --git a/src/main/resources/mapper/sys/SysUserDao.xml b/src/main/resources/mapper/sys/SysUserDao.xml index 5b31a09f..52d36e31 100644 --- a/src/main/resources/mapper/sys/SysUserDao.xml +++ b/src/main/resources/mapper/sys/SysUserDao.xml @@ -56,6 +56,9 @@ and sr.role_name like concat('%',#{roleName},'%') + + + + + + insert into sys_user_token( + user_id, + token, + expire_time, + type, + update_time + )values( + #{userId}, + #{token}, + #{expireTime}, + #{type}, + now() + ) + + + +