From 8ca9b43b3b8ff28261c2a01bce45befd647fd535 Mon Sep 17 00:00:00 2001 From: qitz <18810291185@163.com> Date: Mon, 6 Nov 2023 15:08:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=BB=BA=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=97=B6=E7=9A=84=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/SysUserController.java | 4 +- .../ruoyi/system/mapper/SysPostMapper.java | 8 +++ .../ruoyi/system/mapper/SysUserMapper.java | 7 +++ .../ruoyi/system/service/ISysUserService.java | 6 +- .../service/impl/SysUserServiceImpl.java | 61 ++++++++++++++++--- .../service/impl/AdjudicationServiceImpl.java | 20 +++--- .../utils/FixSelectFlowDetailUtils.java | 1 - .../resources/mapper/system/SysPostMapper.xml | 5 ++ .../resources/mapper/system/SysUserMapper.xml | 9 +++ 9 files changed, 97 insertions(+), 24 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java index 256367b..0252bf8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java @@ -138,7 +138,7 @@ public class SysUserController extends BaseController } user.setCreateBy(getUsername()); user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); - return toAjax(userService.insertUser(user)); + return userService.insertUser(user); } /** @@ -164,7 +164,7 @@ public class SysUserController extends BaseController return error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在"); } user.setUpdateBy(getUsername()); - return toAjax(userService.updateUser(user)); + return userService.updateUser(user); } /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java index 19be227..ffcfb25 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java @@ -33,6 +33,14 @@ public interface SysPostMapper */ public SysPost selectPostById(Long postId); + /** + * 查询岗位为经办人的岗位信息 + * + * @param postCode 岗位编码 + * @return 角色对象信息 + */ + public SysPost selectPostByPostCode(String postCode); + /** * 根据用户ID获取岗位选择框列表 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java index 996c5f9..d80077a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java @@ -58,6 +58,13 @@ public interface SysUserMapper * @return 用户对象信息 */ public SysUser selectUserById(Long userId); + /** + * 通过部门ID查询用户 + * + * @param deptId 部门ID + * @return 用户对象信息 + */ + public List selectUserByDeptId(Long deptId); /** * 新增用户信息 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java index e27184a..58efaf0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java @@ -1,6 +1,8 @@ package com.ruoyi.system.service; import java.util.List; + +import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.wisdomarbitrate.domain.Arbitrator; @@ -112,7 +114,7 @@ public interface ISysUserService * @param user 用户信息 * @return 结果 */ - public int insertUser(SysUser user); + public AjaxResult insertUser(SysUser user); /** * 注册用户信息 @@ -128,7 +130,7 @@ public interface ISysUserService * @param user 用户信息 * @return 结果 */ - public int updateUser(SysUser user); + public AjaxResult updateUser(SysUser user); /** * 用户授权角色 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java index 49f2720..6f83e37 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -1,10 +1,14 @@ package com.ruoyi.system.service.impl; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; import javax.validation.Validator; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.SysDept; +import com.ruoyi.system.mapper.*; import com.ruoyi.wisdomarbitrate.domain.Arbitrator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -24,11 +28,6 @@ import com.ruoyi.common.utils.spring.SpringUtils; import com.ruoyi.system.domain.SysPost; import com.ruoyi.system.domain.SysUserPost; import com.ruoyi.system.domain.SysUserRole; -import com.ruoyi.system.mapper.SysPostMapper; -import com.ruoyi.system.mapper.SysRoleMapper; -import com.ruoyi.system.mapper.SysUserMapper; -import com.ruoyi.system.mapper.SysUserPostMapper; -import com.ruoyi.system.mapper.SysUserRoleMapper; import com.ruoyi.system.service.ISysConfigService; import com.ruoyi.system.service.ISysUserService; @@ -48,6 +47,9 @@ public class SysUserServiceImpl implements ISysUserService @Autowired private SysRoleMapper roleMapper; + @Autowired + private SysDeptMapper sysDeptMapper; + @Autowired private SysPostMapper postMapper; @@ -261,15 +263,35 @@ public class SysUserServiceImpl implements ISysUserService */ @Override @Transactional - public int insertUser(SysUser user) + public AjaxResult insertUser(SysUser user) { + Long deptId = user.getDeptId(); + Long[] postIds = user.getPostIds(); + if(deptId!=null){ + SysDept dept = sysDeptMapper.selectDeptById(deptId); + Integer deptType = dept.getDeptType(); + if(deptType.intValue()==1){ + SysPost sysPost = postMapper.selectPostByPostCode("jbr"); + Long postId = sysPost.getPostId(); + if(postIds.length>0){ + boolean isContain = Arrays.asList(postIds).contains(postId); + if(isContain){ + List sysUsers = userMapper.selectUserByDeptId(deptId); + if(sysUsers!=null&&sysUsers.size()>0){ + return AjaxResult.error("部门类型为仲裁机构的部门的岗位为经办人的用户只能有一个！"); + } + } + } + } + } + // 新增用户信息 int rows = userMapper.insertUser(user); // 新增用户岗位关联 insertUserPost(user); // 新增用户与角色管理 insertUserRole(user); - return rows; + return AjaxResult.success("新建用户成功"); } /** @@ -292,8 +314,28 @@ public class SysUserServiceImpl implements ISysUserService */ @Override @Transactional - public int updateUser(SysUser user) + public AjaxResult updateUser(SysUser user) { + Long deptId = user.getDeptId(); + Long[] postIds = user.getPostIds(); + if(deptId!=null){ + SysDept dept = sysDeptMapper.selectDeptById(deptId); + Integer deptType = dept.getDeptType(); + if(deptType.intValue()==1){ + SysPost sysPost = postMapper.selectPostByPostCode("jbr"); + Long postId = sysPost.getPostId(); + if(postIds.length>0){ + boolean isContain = Arrays.asList(postIds).contains(postId); + if(isContain){ + List sysUsers = userMapper.selectUserByDeptId(deptId); + if(sysUsers!=null&&sysUsers.size()>0){ + return AjaxResult.error("部门类型为仲裁机构的部门的岗位为经办人的用户只能有一个！"); + } + } + } + } + } + Long userId = user.getUserId(); // 删除用户与角色关联 userRoleMapper.deleteUserRoleByUserId(userId); @@ -303,7 +345,8 @@ public class SysUserServiceImpl implements ISysUserService userPostMapper.deleteUserPostByUserId(userId); // 新增用户与岗位管理 insertUserPost(user); - return userMapper.updateUser(user); + userMapper.updateUser(user); + return AjaxResult.success("更新用户成功"); } /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java index 3e371b6..6f15f10 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java @@ -620,17 +620,17 @@ public class AdjudicationServiceImpl implements IAdjudicationService { CaseApplication caseApplication = new CaseApplication(); caseApplication.setId(id); //查询案件信息 - CaseApplication caseApplication1 = caseApplicationService.selectCaseApplication(caseApplication); - if (caseApplication1 != null) { - archivesDetailVO.setCaseApplication(caseApplication1); - } +// CaseApplication caseApplication1 = caseApplicationService.selectCaseApplication(caseApplication); +// if (caseApplication1 != null) { +// archivesDetailVO.setCaseApplication(caseApplication1); +// } //查询案件日志信息 - CaseLogRecord caseLogRecord = new CaseLogRecord(); - caseLogRecord.setCaseAppliId(id); - List caseLogRecords = caseLogRecordService.selectCaseLogRecordList(caseLogRecord); - if (caseLogRecords != null && caseLogRecords.size() > 0) { - archivesDetailVO.setCaseLogRecordList(caseLogRecords); - } +// CaseLogRecord caseLogRecord = new CaseLogRecord(); +// caseLogRecord.setCaseAppliId(id); +// List caseLogRecords = caseLogRecordService.selectCaseLogRecordList(caseLogRecord); +// if (caseLogRecords != null && caseLogRecords.size() > 0) { +// archivesDetailVO.setCaseLogRecordList(caseLogRecords); +// } //查询快递信息 List logisticsInfo = this.getLogisticsInfo(caseApplication); if (logisticsInfo != null && logisticsInfo.size() > 0) { diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/FixSelectFlowDetailUtils.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/FixSelectFlowDetailUtils.java index 75b1e9e..b5dd175 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/FixSelectFlowDetailUtils.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/FixSelectFlowDetailUtils.java @@ -40,7 +40,6 @@ public class FixSelectFlowDetailUtils { private DeptIdentifyMapper deptIdentifyMapper; @Scheduled(cron = "0/10 * * * * ?") -// @Scheduled(cron = "0/30 * * * * ?") @Transactional public void fixExecuteSelectFlowDetailUtils(){ Gson gson = new Gson(); diff --git a/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml index 227c459..99f37ce 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml @@ -45,6 +45,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where post_id = #{postId} + + + +