From 9cd49c81090b77ac8765dd6810f3b05108b70103 Mon Sep 17 00:00:00 2001 From: 18792927508 <1322446236@qq.com> Date: Mon, 16 Oct 2023 20:44:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E8=A7=92=E8=89=B2=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=A1=88=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CaseApplicationController.java | 1 + .../IdentityAuthenticationController.java | 3 + .../mapper/CaseApplicationMapper.java | 9 +- .../service/ICaseApplicationService.java | 1 + .../impl/CaseApplicationServiceImpl.java | 86 +++++++------ .../service/impl/WeChatUserServiceImpl.java | 8 +- .../wisdomarbitrate/CaseApplicationMapper.xml | 113 +++++++++++++----- 7 files changed, 150 insertions(+), 71 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java index f86a9fe..913f002 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java @@ -38,6 +38,7 @@ public class CaseApplicationController extends BaseController { @GetMapping("/list") public TableDataInfo list(CaseApplication caseApplication) { startPage(); +// List list = caseApplicationService.selectCaseApplicationListNew(caseApplication); List list = caseApplicationService.selectCaseApplicationList(caseApplication); return getDataTable(list); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/IdentityAuthenticationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/IdentityAuthenticationController.java index 7260847..8e5f347 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/IdentityAuthenticationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/IdentityAuthenticationController.java @@ -1,6 +1,7 @@ package com.ruoyi.web.controller.wisdomarbitrate; import com.alibaba.fastjson.JSONObject; +import com.ruoyi.common.annotation.Anonymous; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.wisdomarbitrate.domain.IdentityAuthentication; @@ -21,6 +22,7 @@ public class IdentityAuthenticationController extends BaseController { /** * 获取EIDtoken */ + @Anonymous @PostMapping("/selectIdentityAuthenticaEIDtoken") public AjaxResult selectIdentityAuthenticaEIDtoken() { JSONObject tokenResult = identityAuthenticationService.selectIdentityAuthenticaEIDtoken(); @@ -30,6 +32,7 @@ public class IdentityAuthenticationController extends BaseController { /** * 小程序人脸核身后查询身份认证结果 */ + @Anonymous @PostMapping("/selectIdentityAuthenticaRespon") public AjaxResult selectIdentityAuthenticaRespon(@Validated @RequestBody IdentityAuthentication ientityAuthentication) { AjaxResult checkResult = identityAuthenticationService.selectIdentityAuthenticaRespon(ientityAuthentication); diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseApplicationMapper.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseApplicationMapper.java index e24d2a5..a682163 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseApplicationMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseApplicationMapper.java @@ -43,7 +43,7 @@ public interface CaseApplicationMapper { /** * 查询仲裁员根据案件id - * @param arbitrator + * @param id * @return */ String selectArbitratorList(@Param("id") String id); @@ -53,4 +53,11 @@ public interface CaseApplicationMapper { * @param payDTO */ void updatePayType(CaseConfirmPayDTO payDTO); + + /** + * 查询部门长案件 + * @param caseApplication + * @return + */ + List selectDeptHeadCaseApplicationList(@Param("caseApplication") CaseApplication caseApplication, @Param("statusList")List caseStatusList); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseApplicationService.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseApplicationService.java index cb18d94..46bfd0b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseApplicationService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseApplicationService.java @@ -11,6 +11,7 @@ import java.util.List; public interface ICaseApplicationService { List selectCaseApplicationList(CaseApplication caseApplication); + List selectCaseApplicationListNew(CaseApplication caseApplication); int insertcaseApplication(CaseApplication caseApplication); diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java index d1c739b..a86b85f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java @@ -99,41 +99,57 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { * @return */ // @Override -// public List selectCaseApplicationList(CaseApplication caseApplication) { -// // 获取登录用户 -// LoginUser loginUser = getLoginUser(); -// SysUser user = loginUser.getUser(); -// Long userId = user.getUserId(); -// Long deptId = user.getDeptId(); -// List roles = user.getRoles(); -// // 查询登录人身份证号 -// SysUser sysUser = sysUserMapper.selectUserById(userId); -// caseApplication.setIdCard(sysUser.getIdCard()); -// caseApplication.setUserId(String.valueOf(userId)); -// startPage(); -// for (SysRole role : roles) { -// // 超级管理员和仲裁委（部门长）案件，可查看所有案件 √ -// if(role.getRoleName().equals("超级管理员") -// ||role.getRoleName().equals("仲裁委") -// ||role.getRoleName().equals("部门长")){ -// return caseApplicationMapper.selectAdminCaseApplicationList(caseApplication); -// } -// if(role.getRoleName().equals("法律顾问")){ -// // 查询角色有关的用户部门 -// List deptIds = sysDeptMapper.selectUserDeptListByRoleId(role.getRoleId()); -// caseApplication.setDeptIds(deptIds); -// } -// if(StrUtil.isEmpty(caseApplication.getNameId())&&role.getRoleName().equals("申请人")){ -// // 查询角色有关的用户部门 -// caseApplication.setNameId(String.valueOf(sysUser.getDeptId())); -// } -// } -// -// -// // 根据条件查询申请人，被申请人，仲裁员，法律顾问案件 -// return caseApplicationMapper.selectCaseApplicationList(caseApplication); -// -// } + public List selectCaseApplicationListNew(CaseApplication caseApplication) { + // 获取登录用户 + LoginUser loginUser = getLoginUser(); + SysUser user = loginUser.getUser(); + Long userId = user.getUserId(); + + // 查询登录人身份证号 + SysUser sysUser = sysUserMapper.selectUserById(userId); + List roles = sysUser.getRoles(); + // 没有角色不能查看案件列表 + if(CollectionUtil.isEmpty(roles)){ + throw new ServiceException("该用户没有角色权限"); + } + startPage(); + for (SysRole role : roles) { + // 超级管理员和仲裁委（部门长）案件，可查看所有案件 √ + if(role.getRoleName().equals("超级管理员") + ){ + return caseApplicationMapper.selectAdminCaseApplicationList(caseApplication); + } + if(role.getRoleName().equals("仲裁委") + ||role.getRoleName().equals("部门长")){ + List caseStatusList=new ArrayList<>(); + caseStatusList.add(CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL); + caseStatusList.add(CaseApplicationConstants.SIGN_ARBITRATION); + caseStatusList.add(CaseApplicationConstants.ARBITRATED_SEAL); + return caseApplicationMapper.selectDeptHeadCaseApplicationList(caseApplication,caseStatusList); + } + if(role.getRoleName().equals("仲裁员")){ + caseApplication.setUserId(String.valueOf(userId)); + } + if(role.getRoleName().equals("法律顾问")){ + // 查询角色有关的用户部门 + List deptIds = sysDeptMapper.selectUserDeptListByRoleId(role.getRoleId()); + caseApplication.setDeptIds(deptIds); + } + if(StrUtil.isEmpty(caseApplication.getNameId())&&role.getRoleName().equals("申请人")){ + // 查询角色有关的用户部门 + caseApplication.setNameId(String.valueOf(sysUser.getDeptId())); + } + if(role.getRoleName().equals("被申请人")){ + // + caseApplication.setIdCard(String.valueOf(sysUser.getIdCard())); + } + } + + + // 根据条件查询申请人，被申请人，仲裁员，法律顾问案件 + return caseApplicationMapper.selectCaseApplicationList(caseApplication); + + } @Override public List selectCaseApplicationList(CaseApplication caseApplication) { return caseApplicationMapper.selectAdminCaseApplicationList(caseApplication); diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/WeChatUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/WeChatUserServiceImpl.java index c03808e..be822f6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/WeChatUserServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/WeChatUserServiceImpl.java @@ -108,12 +108,12 @@ public class WeChatUserServiceImpl implements WeChatUserService { @Override public AjaxResult registerUser(IdentityAuthentication ientityAuthentication) { // 校验短信验证码 -// if(StrUtil.isEmpty(getCodeCache(ientityAuthentication.getPhone()))){ -// return AjaxResult.success("验证码校验失败"); -// } + if(StrUtil.isEmpty(getCodeCache(ientityAuthentication.getPhone()))){ + return AjaxResult.success("验证码校验失败"); + } SysUser sysUserName=sysUserMapper.selectUserByUserName(ientityAuthentication.getUserName()); if(sysUserName!=null){ - return AjaxResult.warn("用户名已存在"); + return AjaxResult.warn("账号已存在"); } // 根据身份证查询系统用户表中是否存在该用户，存在则同步已认证的信息，不存在则新增 SysUser sysUser=sysUserMapper.selectUserByIdCard(ientityAuthentication.getIdentityNo()); diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml index 3c7610f..aa643f6 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml @@ -38,28 +38,30 @@ + +