LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

消息修改

Browse Source
This commit is contained in:
梁琦涛
2021-09-26 15:13:52 +08:00
parent d17a369155
commit 6fe35ff788
13 changed files with 141 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/common/common/ProjectCommon.java
+1
View File
@@ -142,4 +142,5 @@ public class ProjectCommon {
* 1短信 2邮件 3系统
*/
public final static String MESSAGE_TYPE3 = "3";
}
jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java
+1 -1
View File
@@ -153,7 +153,7 @@ public class SendMessageServiceImpl implements SendMessageService {
// todo 发送短信 待完成
if(templateType.contains(ProjectCommon.MESSAGE_TYPE1) && !StringUtils.isEmpty(sendMessageDTO.getPhone())){
try {
sysBaseAPI.sendSMS(sendMessageDTO.getPhone(),type,time,sendMessageDTO.getTemplateCode(),sendMessageDTO.getTemplateParam());
// sysBaseAPI.sendSMS(sendMessageDTO.getPhone(),type,time,sendMessageDTO.getTemplateCode(),sendMessageDTO.getTemplateParam());
}catch (Exception e){
log.error("发送短信异常",e);
}
jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java
+18 -1
View File
@@ -198,7 +198,24 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
}
}
payCompanyManagementService.save(payCompanyManagement);
// 获取项目负责人，发送消息
List<SysUser> list = sysUserService.getRolesUser(Arrays.asList(RoleCommon.QYXXWHRY));
if(!CollectionUtils.isEmpty(list)){
list.forEach(item->{
// 发送消息
SendMessageDTO sendMessageDTO = new SendMessageDTO();
if(!StringUtils.isBlank(item.getEmail())){
sendMessageDTO.setEmail(PasswordUtil.decrypt(item.getEmail()));
}
HashMap<String,String> map = new HashMap<>();
sendMessageDTO.setFromUser("admin");
sendMessageDTO.setToUser(item.getUsername());
sendMessageDTO.setTemplateCode(ManagementMessageEnums.MSG9.getCode());
sendMessageDTO.setTemplateParam(map);
sendMessageDTO.setBusType("M_OPEN_TYPE9");
sendMessageService.SendMessageService(sendMessageDTO);
});
}
return Result.OK("添加成功！",payCompanyManagement);
}
jero-boot-incoming-payment/src/main/java/com/jero/contract/common/PayIncomeContractCommon.java
+8 -3
View File
@@ -95,9 +95,14 @@ public class PayIncomeContractCommon {
*/
public final static Integer COME2 = 2;
public static void main(String[] args) {
}
/**
* 邮寄状态(0:未邮寄，1:已邮寄)
*/
public final static Integer POST_STATUS0 = 0;
/**
* 邮寄状态(0:未邮寄，1:已邮寄)
*/
public final static Integer POST_STATUS1 = 1;
/**
* RSA 使用公钥加密token
* @param RSAPublicKey 公钥
jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java
+27 -16
View File
@@ -6,14 +6,11 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.api.dto.message.BusTemplateMessageDTO;
import com.jero.common.common.RoleCommon;
import com.jero.common.dto.SendMessageDTO;
import com.jero.common.enums.CompanyMessageEnums;
import com.jero.common.enums.ManagementMessageEnums;
import com.jero.common.exception.JeroBootException;
import com.jero.common.service.SendMessageService;
import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.PasswordUtil;
import com.jero.common.util.ValidUtil;
@@ -29,6 +26,8 @@ import com.jero.contract.service.IPayIncomeContractInstallmentService;
import com.jero.contract.service.IPayIncomeContractService;
import com.jero.contract.vo.PayIncomeContractInput;
import com.jero.contract.vo.ProjectOutput;
import com.jero.mail.entity.PayMailContract;
import com.jero.mail.service.IPayMailContractService;
import com.jero.meeting.common.MeetingSubitemCommon;
import com.jero.meeting.entity.PayMeeting;
import com.jero.meeting.entity.PayMeetingSituation;
@@ -47,7 +46,6 @@ import com.jero.modules.system.service.ISysUserService;
import com.jero.pack.common.PackCommon;
import com.jero.pack.entity.PayPackCompanyProject;
import com.jero.pack.service.IPayPackCompanyProjectService;
import com.jero.project.common.PayProjectCommon;
import com.jero.project.entity.PayCommonProject;
import com.jero.project.entity.PayWorkingGroup;
import com.jero.project.entity.PayWorkingGroupSubItem;
@@ -62,7 +60,6 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
@@ -81,27 +78,27 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
@Resource
private PayIncomeContractMapper payIncomeContractMapper;
@Autowired
@Resource
private IPayIncomeContractService payIncomeContractService;
@Autowired
@Resource
private IPayIncomeContractInstallmentService payIncomeContractInstallmentService;
@Autowired
@Resource
private IPayIncomeContractAssociatedService payIncomeContractAssociatedService;
@Autowired
@Resource
private IPayIncomeContractAuditService payIncomeContractAuditService;
@Autowired
@Resource
private ISysUserService sysUserService;
@Autowired
@Resource
private IPayCompanyManagementTemporaryService payCompanyManagementTemporaryService;
@Autowired
@Resource
private IPayContactsManagementTemporaryService payContactsManagementTemporaryService;
@Autowired
@Resource
private IPayCommonProjectService payCommonProjectService;
@Autowired
@Resource
private IPayWorkingGroupService payWorkingGroupService;
@Autowired
@Resource
private IPayWorkingGroupSubItemService payWorkingGroupSubItemService;
@Autowired
@Resource
private IPayPackCompanyProjectService payPackCompanyProjectService;
@Resource
private IPayMeetingSituationService payMeetingSituationService;
@@ -117,6 +114,8 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
private ITbMemberProjectService tbMemberProjectService;
@Resource
private IPayMeetingService payMeetingService;
@Resource
private IPayMailContractService payMailContractService;
@Override
public IPage<PayIncomeContract> queryPageList(Page<PayIncomeContract> page, PayIncomeContract payIncomeContract, String chargeStatus,String projectName, String startTime, String endTime) {
@@ -852,6 +851,18 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
payIncomeContractService.update(update);
// 添加审核记录
payIncomeContractAuditService.save(payIncomeContractAudit);
// 更新到合同邮寄表
PayMailContract payMailContract = new PayMailContract();
PayContactsManagementTemporary payContactsManagementTemporary = payContactsManagementTemporaryService.getById(payIncomeContractStatus.getSignedContactsTemporaryId());
if(!Objects.isNull(payContactsManagementTemporary)){
payMailContract.setMobile(payContactsManagementTemporary.getPhone());
payMailContract.setEmail(payContactsManagementTemporary.getEmail());
}
payMailContract.setContractId(payIncomeContractStatus.getId());
payMailContract.setPostStatus(PayIncomeContractCommon.POST_STATUS0);
payMailContract.setLiaisonMan(payIncomeContractStatus.getContractName());
payMailContractService.save(payMailContract);
String code = "";
String role = "";
String type = "";
jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
+30 -5
View File
@@ -14,17 +14,17 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result;
import com.jero.common.common.ProjectCommon;
import com.jero.common.constant.GlobalConstants;
import com.jero.common.dto.SendMessageDTO;
import com.jero.common.enums.CompanyMessageEnums;
import com.jero.common.service.ProjectDetailService;
import com.jero.common.service.SendMessageService;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.PasswordUtil;
import com.jero.common.vo.ProjectDetailVO;
import com.jero.company.entity.PayContactsManagement;
import com.jero.company.service.IPayContactsManagementService;
import com.jero.mail.commont.constant;
import com.jero.mail.entity.PayMailBill;
import com.jero.mail.entity.PayMailBillProject;
import com.jero.mail.entity.PayMailBillSearch;
import com.jero.mail.entity.PayMailContract;
import com.jero.mail.service.IPayMailBillProjectService;
import com.jero.mail.service.IPayMailBillService;
import com.jero.meeting.entity.PayMeetingSituation;
@@ -41,6 +41,7 @@ import com.jero.util.AmountUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -48,7 +49,9 @@ import org.springframework.web.servlet.ModelAndView;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
/**
import javax.annotation.Resource;
/**
* @Description: 邮寄票据
* @Author: jeecg-boot
* @Date: 2021-09-02
@@ -78,6 +81,8 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
private IPayWorkingGroupSubItemService payWorkingGroupSubItemService;
@Autowired
private ITbMemberProjectSubitemService tbMemberProjectSubitemService;
@Resource
private SendMessageService sendMessageService;
/**
* 分页列表查询
@@ -262,6 +267,26 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
payMailBillService.pushSendToStandards(payMailBill,one.getProjectId());
}
}
PayMailBill payMailBillData = payMailBillService.getById(payMailBill.getId());
if(!Objects.isNull(payMailBillData)){
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// 发送消息
SendMessageDTO sendMessageDTO = new SendMessageDTO();
if(!StringUtils.isBlank(payMailBillData.getEmail())){
sendMessageDTO.setEmail(PasswordUtil.decrypt(payMailBillData.getEmail()));
}
if(!StringUtils.isBlank(payMailBillData.getContactMobile())){
sendMessageDTO.setToUser(payMailBillData.getContactMobile());
sendMessageDTO.setPhone(payMailBillData.getContactMobile());
}
HashMap<String,String> map = new HashMap<>();
map.put("projectName",payMailBillData.getProjectName());
sendMessageDTO.setFromUser(sysUser.getUsername());
sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG9.getCode());
sendMessageDTO.setTemplateParam(map);
sendMessageDTO.setBusType("C_OPEN_TYPE9");
sendMessageService.SendMessageService(sendMessageDTO);
}
return Result.OK("编辑成功!");
}
jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java
+43 -5
View File
@@ -1,14 +1,24 @@
package com.jero.mail.controller;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Objects;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.common.ProjectCommon;
import com.jero.common.dto.SendMessageDTO;
import com.jero.common.enums.CompanyMessageEnums;
import com.jero.common.service.SendMessageService;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.PasswordUtil;
import com.jero.contract.entity.PayIncomeContract;
import com.jero.contract.service.IPayIncomeContractService;
import com.jero.mail.entity.PayMailBillList;
import com.jero.mail.entity.PayMailContract;
import com.jero.mail.service.IPayMailContractService;
@@ -17,7 +27,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.util.AmountUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.apache.shiro.SecurityUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import io.swagger.annotations.Api;
@@ -34,8 +44,12 @@ import io.swagger.annotations.ApiOperation;
@RequestMapping("/payMailContract/payMailContract")
@Slf4j
public class PayMailContractController extends JeroController<PayMailContract, IPayMailContractService> {
@Autowired
@Resource
private IPayMailContractService payMailContractService;
@Resource
private IPayIncomeContractService payIncomeContractService;
@Resource
private SendMessageService sendMessageService;
/**
* 邮寄合同-分页列表查询
@@ -64,8 +78,32 @@ public class PayMailContractController extends JeroController<PayMailContract, I
@PostMapping(value = "/edit")
public Result<?> edit(@RequestBody PayMailContract payMailContract
) {
PayMailContract payMailContractData = payMailContractService.getById(payMailContract.getId());
payMailContract.setPostStatus(1);
payMailContractService.updateById(payMailContract);
if(!Objects.isNull(payMailContractData) && Objects.equals(payMailContractData.getPostStatus(), ProjectCommon.POST_STATUS0)){
PayIncomeContract payIncomeContract = payIncomeContractService.getById(payMailContractData.getContractId());
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// 发送消息
SendMessageDTO sendMessageDTO = new SendMessageDTO();
if(!StringUtils.isBlank(payMailContractData.getEmail())){
sendMessageDTO.setEmail(PasswordUtil.decrypt(payMailContractData.getEmail()));
}
if(!StringUtils.isBlank(payMailContractData.getMobile())){
sendMessageDTO.setToUser(PasswordUtil.decrypt(payMailContractData.getMobile()));
sendMessageDTO.setPhone(PasswordUtil.decrypt(payMailContractData.getMobile()));
}
HashMap<String,String> map = new HashMap<>();
if(Objects.isNull(payIncomeContract)){
map.put("contractName",payIncomeContract.getContractName());
}
sendMessageDTO.setFromUser(sysUser.getUsername());
sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG10.getCode());
sendMessageDTO.setTemplateParam(map);
sendMessageDTO.setBusType("C_OPEN_TYPE10");
sendMessageService.SendMessageService(sendMessageDTO);
}
return Result.OK("操作成功!");
}
jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailContract.java
+3
View File
@@ -81,4 +81,7 @@ public class PayMailContract implements Serializable {
@Excel(name = "联系人手机号", width = 15)
@ApiModelProperty(value = "联系人手机号")
private java.lang.String mobile;
/**联系人邮箱*/
@ApiModelProperty(value = "联系人邮箱")
private String email;
}
jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupStatisticsController.java
+2 -6
View File
@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result;
import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.system.vo.ComboModel;
import com.jero.common.system.vo.DictModel;
import com.jero.common.system.vo.LoginUser;
import com.jero.mail.commont.constant;
import com.jero.modules.system.entity.SysUser;
@@ -23,9 +21,7 @@ import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.poi.hssf.record.DVALRecord;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
@@ -85,7 +81,7 @@ public class PayWorkingGroupStatisticsController {
List<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
//所领导或者超级管理员
} else if (constant.SLD.equals(roleCode)||constant.ADMIN.equals(roleCode)) {
} else if (constant.SLD.equals(roleCode)|| constant.ADMIN.equals(roleCode)) {
idList=null;
//企业职员项目负责人
}else if( constant.QYRY.equals(roleCode)){
@@ -160,7 +156,7 @@ public class PayWorkingGroupStatisticsController {
List<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
//所领导或者超级管理员
} else if (constant.SLD.equals(roleCode)||constant.ADMIN.equals(roleCode)) {
} else if (constant.SLD.equals(roleCode)|| constant.ADMIN.equals(roleCode)) {
idList=null;
//企业职员项目负责人
}else if( constant.QYRY.equals(roleCode)){
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java
-13
View File
@@ -5,19 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result;
import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.system.vo.LoginUser;
import com.jero.mail.commont.constant;
import com.jero.meeting.service.IPayMeetingSituationService;
import com.jero.member.service.IPayMemberProjectService;
import com.jero.member.service.IPayMemberProjectSubitemService;
import com.jero.member.service.ITbMemberProjectService;
import com.jero.member.service.ITbMemberProjectSubitemService;
import com.jero.project.entity.PayCommonProject;
import com.jero.project.entity.PayWorkGroupSubletStatistics;
import com.jero.project.entity.PayWorkingGroupStatistics;
import com.jero.project.entity.PayWorkingGroupSubletSearch;
import com.jero.project.service.IPayCommonProjectService;
import com.jero.project.service.IPayWorkingGroupService;
import com.jero.project.service.IPayWorkingGroupSubItemService;
import com.jero.statistics.entity.AllProjectStatistics;
import com.jero.statistics.entity.AllProjectStatisticsSearch;
import com.jero.util.AmountUtil;
@@ -31,7 +19,6 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.HashMap;
import java.util.List;
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java
+3 -3
View File
@@ -77,7 +77,7 @@ public class CompanyComeMoneyStatisticsController {
List<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
//所领导或者超级管理员
} else if (constant.SLD.equals(roleCode)||constant.ADMIN.equals(roleCode)) {
} else if (constant.SLD.equals(roleCode)|| constant.ADMIN.equals(roleCode)) {
idList=null;
//企业职员项目负责人
}else if( constant.QYRY.equals(roleCode)){
@@ -143,7 +143,7 @@ public class CompanyComeMoneyStatisticsController {
List<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
//所领导或者超级管理员
} else if (constant.SLD.equals(roleCode)||constant.ADMIN.equals(roleCode)) {
} else if (constant.SLD.equals(roleCode)|| constant.ADMIN.equals(roleCode)) {
idList=null;
//企业职员项目负责人
}else if( constant.QYRY.equals(roleCode)){
@@ -208,7 +208,7 @@ public class CompanyComeMoneyStatisticsController {
List<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
//所领导或者超级管理员
} else if (constant.SLD.equals(roleCode)||constant.ADMIN.equals(roleCode)) {
} else if (constant.SLD.equals(roleCode)|| constant.ADMIN.equals(roleCode)) {
idList=null;
//企业职员项目负责人
}else if( constant.QYRY.equals(roleCode)){
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java
+2 -5
View File
@@ -1,6 +1,5 @@
package com.jero.statistics.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -10,10 +9,8 @@ import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.vo.ProjectDetailVO;
import com.jero.mail.commont.constant;
import com.jero.mail.entity.PayMailBillProject;
import com.jero.modules.system.entity.SysUser;
import com.jero.modules.system.mapper.SysUserMapper;
import com.jero.project.entity.PayWorkGroupSubletStatistics;
import com.jero.project.service.IPayWorkingGroupService;
import com.jero.statistics.entity.*;
import com.jero.util.AmountUtil;
@@ -83,7 +80,7 @@ public class PrincipalPeopleStatisticsController {
List<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
//所领导或者超级管理员
} else if (constant.SLD.equals(roleCode)||constant.ADMIN.equals(roleCode)) {
} else if (constant.SLD.equals(roleCode)|| constant.ADMIN.equals(roleCode)) {
idList=null;
//企业职员项目负责人
}else if( constant.QYRY.equals(roleCode)){
@@ -214,7 +211,7 @@ public class PrincipalPeopleStatisticsController {
List<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
//所领导或者超级管理员
} else if (constant.SLD.equals(roleCode)||constant.ADMIN.equals(roleCode)) {
} else if (constant.SLD.equals(roleCode)|| constant.ADMIN.equals(roleCode)) {
idList=null;
//企业职员项目负责人
}else if( constant.QYRY.equals(roleCode)){
jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java
+3 -3
View File
@@ -525,17 +525,17 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
@Override
public List<SysUser> getRolesUser(List<String> roleCode) {
if(CollectionUtils.isEmpty(roleCode)){
throw new JeroBootException("角色编码为空！");
return null;
}
LambdaQueryWrapper<SysRole> queryRole = new LambdaQueryWrapper<>();
queryRole.in(SysRole::getRoleCode,roleCode);
List<SysRole> listSysRole = sysRoleMapper.selectList(queryRole);
if(CollectionUtils.isEmpty(listSysRole)){
throw new JeroBootException("角色不存在！");
return null;
}
List<String> listRoleId = listSysRole.stream().map(SysRole::getId).collect(Collectors.toList());
if(CollectionUtils.isEmpty(listRoleId)){
throw new JeroBootException("角色不存在！");
return null;
}
LambdaQueryWrapper<SysUserRole> querySysUserRole = new LambdaQueryWrapper<>();
querySysUserRole.in(SysUserRole::getRoleId,listRoleId);