From f71c5cf25d9f91f3e15627fd36f94ab46f3036f7 Mon Sep 17 00:00:00 2001 From: Yen Date: Tue, 26 Jul 2022 08:58:30 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=94=A8=E6=88=B7=EF=BC=8C?= =?UTF-8?q?=E5=8E=BB=E9=99=A4=E7=A7=9F=E6=88=B7=E6=8B=93=E5=B1=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/qs/serve/Application.java | 1 - .../common/framework/aop/SysLogAspect.java | 2 +- .../sys/controller/SysDeptController.java | 36 ++++-- .../sys/controller/SysNoticeController.java | 2 +- .../controller/SysOperationLogController.java | 12 ++ .../sys/controller/SysRoleController.java | 2 +- .../controller/SysRolePermitController.java | 95 --------------- .../sys/controller/SysUserController.java | 115 ++---------------- .../sys/controller/SysUserRoleController.java | 96 --------------- .../qs/serve/modules/sys/entity/SysDept.java | 10 ++ .../sys/entity/dto/SysNavUserEditBatch.java | 16 --- .../modules/sys/entity/dto/SysUserVo.java | 1 - .../sys/mapper/SysUserTenantMapper.java | 14 --- .../modules/sys/service/SysUserService.java | 12 -- .../sys/service/SysUserTenantService.java | 37 ------ ...iceImpl.java => SysAttachServiceImpl.java} | 2 +- .../sys/service/impl/SysDeptServiceImpl.java | 2 - .../sys/service/impl/SysUserServiceImpl.java | 50 -------- .../impl/SysUserTenantServiceImpl.java | 57 --------- 19 files changed, 66 insertions(+), 496 deletions(-) delete mode 100644 src/main/java/com/qs/serve/modules/sys/controller/SysRolePermitController.java delete mode 100644 src/main/java/com/qs/serve/modules/sys/controller/SysUserRoleController.java delete mode 100644 src/main/java/com/qs/serve/modules/sys/entity/dto/SysNavUserEditBatch.java delete mode 100644 src/main/java/com/qs/serve/modules/sys/mapper/SysUserTenantMapper.java delete mode 100644 src/main/java/com/qs/serve/modules/sys/service/SysUserTenantService.java rename src/main/java/com/qs/serve/modules/sys/service/impl/{SysDocumentServiceImpl.java => SysAttachServiceImpl.java} (81%) delete mode 100644 src/main/java/com/qs/serve/modules/sys/service/impl/SysUserTenantServiceImpl.java diff --git a/src/main/java/com/qs/serve/Application.java b/src/main/java/com/qs/serve/Application.java index 8fe1be4..81aefc8 100644 --- a/src/main/java/com/qs/serve/Application.java +++ b/src/main/java/com/qs/serve/Application.java @@ -28,7 +28,6 @@ public class Application extends SpringBootServletInitializer { public static void main(String[] args) { DevEnvironmentConfig.openDevEnv(true); - DevEnvironmentConfig.setCloseBpmImg(true); SpringApplication.run(Application.class,args); } diff --git a/src/main/java/com/qs/serve/common/framework/aop/SysLogAspect.java b/src/main/java/com/qs/serve/common/framework/aop/SysLogAspect.java index 83050d2..775a8df 100644 --- a/src/main/java/com/qs/serve/common/framework/aop/SysLogAspect.java +++ b/src/main/java/com/qs/serve/common/framework/aop/SysLogAspect.java @@ -92,7 +92,7 @@ public class SysLogAspect { if (loginUser != null) { operLog.setUserId(loginUser.getUserId()); operLog.setUserType(loginUser.getTypeFlag().getCode()); - SysUser sysUser = sysUserService.getById2(loginUser.getUserId()); + SysUser sysUser = sysUserService.getById(loginUser.getUserId()); if(sysUser!=null){ operLog.setCreatorName(sysUser.getName()); } diff --git a/src/main/java/com/qs/serve/modules/sys/controller/SysDeptController.java b/src/main/java/com/qs/serve/modules/sys/controller/SysDeptController.java index 52ed357..245105b 100644 --- a/src/main/java/com/qs/serve/modules/sys/controller/SysDeptController.java +++ b/src/main/java/com/qs/serve/modules/sys/controller/SysDeptController.java @@ -144,14 +144,36 @@ public class SysDeptController { @PreAuthorize("hasRole('sys:post:update')") @Transactional(rollbackFor = Exception.class) public R updateLevel(@RequestBody @Valid SysDeptTranParam param){ - SysDept parent = sysDeptService.getById(param.getParentId()); - if(parent==null){ - return R.error("无效的上级部门"); + SysDept dept = sysDeptService.getById(param.getSelectId()); + if(dept.getParentId().equals(param.getParentId())){ + return R.ok(); } - SysDept sysDept = new SysDept(); - sysDept.setParentId(parent.getParentId()); - sysDept.setId(param.getSelectId()); - sysDeptService.updateById(sysDept); + String subLevelPath = ""; + String subLevelPathName = ""; + if(!dept.getParentId().equals(TreeUtil.DEFAULT_PID_STRING)){ + SysDept orgParent = sysDeptService.getById(dept.getParentId()); + subLevelPath = orgParent.getLevelPath()+"_"; + } + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.select(SysDept::getId,SysDept::getParentId,SysDept::getLevelPath); + wrapper.likeRight(SysDept::getLevelPath,dept.getLevelPath()); + List deptList = sysDeptService.list(wrapper); + SysDept parent = null; + if(param.getParentId().equals(TreeUtil.DEFAULT_PID_STRING)){ + parent = sysDeptService.getById(param.getParentId()); + } + for (SysDept sysDept : deptList) { + if(sysDept.getId().equals(param.getSelectId())){ + sysDept.setParentId(param.getParentId()); + } + String levelPath = sysDept.getLevelPath().replace(subLevelPath,""); + if(parent==null){ + sysDept.setLevelPath(levelPath); + }else { + sysDept.setLevelPath(parent.getLevelPath()+"_"+levelPath); + } + } + sysDeptService.updateBatchById(deptList); return R.ok(); } /** diff --git a/src/main/java/com/qs/serve/modules/sys/controller/SysNoticeController.java b/src/main/java/com/qs/serve/modules/sys/controller/SysNoticeController.java index e7dd3d8..643d8e1 100644 --- a/src/main/java/com/qs/serve/modules/sys/controller/SysNoticeController.java +++ b/src/main/java/com/qs/serve/modules/sys/controller/SysNoticeController.java @@ -76,7 +76,7 @@ public class SysNoticeController { PageUtil.startPage(); List list = sysNoticeService.list(wrapper); for (SysNotice notice : list) { - SysUser sysUser = sysUserService.getById2(notice.getCreateBy()); + SysUser sysUser = sysUserService.getById(notice.getCreateBy()); if(sysUser!=null){ notice.setCreatorName(sysUser.getName()); } diff --git a/src/main/java/com/qs/serve/modules/sys/controller/SysOperationLogController.java b/src/main/java/com/qs/serve/modules/sys/controller/SysOperationLogController.java index f207163..87f157e 100644 --- a/src/main/java/com/qs/serve/modules/sys/controller/SysOperationLogController.java +++ b/src/main/java/com/qs/serve/modules/sys/controller/SysOperationLogController.java @@ -53,6 +53,18 @@ public class SysOperationLogController { return R.byPageHelperList(list); } + /** + * 翻页查询（个人） + * @param param + * @return + */ + @GetMapping("/pageSelf") + public R> pageSelf(SysOperationLog param){ + LoginUser loginUser = AuthContextUtils.getLoginUser(); + param.setUserId(loginUser.getUserId()); + return this.getList(param); + } + /** * 根据ID查询 * @param id diff --git a/src/main/java/com/qs/serve/modules/sys/controller/SysRoleController.java b/src/main/java/com/qs/serve/modules/sys/controller/SysRoleController.java index 73bf9c8..484f95b 100644 --- a/src/main/java/com/qs/serve/modules/sys/controller/SysRoleController.java +++ b/src/main/java/com/qs/serve/modules/sys/controller/SysRoleController.java @@ -242,7 +242,7 @@ public class SysRoleController { @PostMapping("/removeUserRole") @PreAuthorize("hasRole('sys:userRole:delete')") public R deleteById(@RequestBody @Valid SysRoleUserParam sysRoleUserParam){ - boolean result = sysUserRoleService.remove(sysRoleUserParam.getRoleId(),sysRoleUserParam.getUserIds()); + sysUserRoleService.remove(sysRoleUserParam.getRoleId(),sysRoleUserParam.getUserIds()); return R.ok(); } diff --git a/src/main/java/com/qs/serve/modules/sys/controller/SysRolePermitController.java b/src/main/java/com/qs/serve/modules/sys/controller/SysRolePermitController.java deleted file mode 100644 index 64a51be..0000000 --- a/src/main/java/com/qs/serve/modules/sys/controller/SysRolePermitController.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.qs.serve.modules.sys.controller; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.qs.serve.common.model.annotation.SysLog; -import com.qs.serve.common.model.dto.PageVo; -import com.qs.serve.common.model.dto.R; -import com.qs.serve.common.model.enums.BizType; -import com.qs.serve.common.util.PageUtil; -import com.qs.serve.modules.sys.entity.SysRolePermit; -import com.qs.serve.modules.sys.service.SysRolePermitService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.validation.Valid; -import java.util.List; - -/** - * 系统：角色权限 - * @author YenHex - * @since 2022-03-01 - */ -@Slf4j -//@AllArgsConstructor -//@RestController -//@RequestMapping("sys/rolePermit") -public class SysRolePermitController { - - private SysRolePermitService sysRolePermitService; - - /** - * 查询列表 - * @param param - * @return - */ - @GetMapping("/page") - @PreAuthorize("hasRole('sys:rolePermit:query')") - public R> getList(SysRolePermit param){ - PageUtil.startPage(); - List list = sysRolePermitService.list(new QueryWrapper<>(param)); - return R.byPageHelperList(list); - } - - /** - * 根据ID查询 - * @param id - * @return - */ - @GetMapping("/getById/{id}") - @PreAuthorize("hasRole('sys:rolePermit:query')") - public R getById(@PathVariable("id") String id){ - SysRolePermit sysRolePermit = sysRolePermitService.getById(id); - return R.ok(sysRolePermit); - } - - /** - * 保存 - * @param param - * @return - */ - @SysLog(title = "角色授权",biz = BizType.GRANT) - @PostMapping("/save") - @PreAuthorize("hasRole('sys:rolePermit:insert')") - public R save(@RequestBody @Valid SysRolePermit param){ - boolean result = sysRolePermitService.save(param); - return R.isTrue(result); - } - - /** - * 根据ID更新 - * @param param - * @return - */ - @SysLog(title = "角色授权",biz = BizType.GRANT) - @PostMapping("/updateById") - @PreAuthorize("hasRole('sys:rolePermit:update')") - public R updateById(@RequestBody @Valid SysRolePermit param){ - boolean result = sysRolePermitService.updateById(param); - return R.isTrue(result); - } - - /** - * 删除 - * @param id - * @return - */ - @PostMapping("/deleteById/{id}") - @PreAuthorize("hasRole('sys:rolePermit:delete')") - public R deleteById(@PathVariable("id") String id){ - boolean result = sysRolePermitService.removeById(id); - return R.isTrue(result); - } - -} - diff --git a/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java b/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java index 1671779..a85dd0e 100644 --- a/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java +++ b/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java @@ -41,85 +41,12 @@ import java.util.stream.Collectors; public class SysUserController { private SysUserService sysUserService; - private SysUserTenantService sysUserTenantService; private SysUserMapper sysUserMapper; private SysDeptService sysDeptService; private SysPostService sysPostService; private SysRoleService sysRoleService; private RedisService redisService; - /** - * 翻页查询（用于配置校区） - * @param param - * @return - */ - @GetMapping("/page3") - @PreAuthorize("hasRole('sys:user:query')") - public R> getPage3(SysUser param){ - PageUtil.startPage(); - List list = sysUserService.listUser(param); - list.forEach(usr->usr.setPassword(null)); - for (SysUser sysUser : list) { - sysUser.setPassword(null); - List userTenants = sysUserTenantService.listByUserId(sysUser.getId(),false); - sysUser.setTenantInfo(userTenants); - } - return R.byPageHelperList(list); - } - - /** - * 编辑用户校区 - * @param param - * @return - */ - @PreAuthorize("hasRole('sys:user:update')") - @PostMapping("/settingTenant") - @Transactional(rollbackFor = Exception.class) - public R settingTenant(@RequestBody SysUserTenantEditParam param){ - SysUser sysUser = sysUserService.getById(param.getUserId()); - List userTenants = sysUserTenantService.listByUserId(sysUser.getId()); - List leaveUser = new ArrayList<>(); - for (SysUserTenant userTenant : userTenants) { - boolean exist = false; - for (String tenantId : param.getTenantIds()) { - if(userTenant.getTenantId().equals(tenantId)){ - exist = true; - if(userTenant.getServingState().equals(0)){ - userTenant.setServingState(1); - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(SysUserTenant::getTenantId,userTenant.getTenantId()); - wrapper.eq(SysUserTenant::getId,userTenant.getId()); - sysUserTenantService.update(userTenant,wrapper); - } - break; - } - } - if(!exist){ - leaveUser.add(userTenant); - } - } - for (SysUserTenant userTenant : leaveUser) { - userTenant.setServingState(0); - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(SysUserTenant::getTenantId,userTenant.getTenantId()); - wrapper.eq(SysUserTenant::getId,userTenant.getId()); - sysUserTenantService.update(userTenant,wrapper); - } - for (String tenantId : param.getTenantIds()) { - boolean exist = false; - for (SysUserTenant userTenant : userTenants) { - if(tenantId.equals(userTenant.getTenantId())){ - exist = true; - break; - } - } - if(!exist){ - SysUserTenant userTenant = sysUser.toSysUserTenant(tenantId); - sysUserTenantService.save(userTenant); - } - } - return R.ok(); - } /** * 个人登录信息 @@ -128,7 +55,7 @@ public class SysUserController { @PostMapping("/info") public R info(){ LoginUser loginUser = AuthContextUtils.getLoginUser(); - SysUser sysUser = sysUserService.getById2(loginUser.getUserId()); + SysUser sysUser = sysUserService.getById(loginUser.getUserId()); sysUser.setAuthorIds(loginUser.getAuthorIds()); sysUser.setAuthorList(loginUser.getAuthorList()); SysUserVo sysUserVo = sysUser.toSysUserVo(false); @@ -136,8 +63,6 @@ public class SysUserController { sysUserVo.setDeptInfo(dept); SysPost sysPost = sysPostService.getById(sysUser.getPositionId()); sysUserVo.setPostInfo(sysPost); - List tenants = sysUserTenantService.listByUserId(loginUser.getUserId(),false); - sysUserVo.setTenantInfos(tenants); return R.ok(sysUserVo); } @@ -149,7 +74,7 @@ public class SysUserController { @GetMapping("/detail") public R detail(){ LoginUser loginUser = AuthContextUtils.getLoginUser(); - SysUser sysUser = sysUserService.getById2(loginUser.getUserId()); + SysUser sysUser = sysUserService.getById(loginUser.getUserId()); sysUser.setAuthorIds(loginUser.getAuthorIds()); sysUser.setAuthorList(loginUser.getAuthorList()); sysUserService.relateInfo(sysUser); @@ -188,7 +113,7 @@ public class SysUserController { @PostMapping("/updatePwd") public R updatePwd(@RequestBody @Valid SysUserPwdParam param){ LoginUser loginUser = AuthContextUtils.getLoginUser(); - SysUser dbUser = sysUserService.getById2(loginUser.getUserId()); + SysUser dbUser = sysUserService.getById(loginUser.getUserId()); if(dbUser.getPassword().equalsIgnoreCase(SecureUtil.md5(param.getOldPassword()))){ SysUser sysUser = new SysUser(); sysUser.setId(loginUser.getUserId()); @@ -280,22 +205,6 @@ public class SysUserController { return R.byPageHelperList(list); } - /** - * 列表查询（通讯录，添加隐藏标识过滤） - * @param param - * @return - */ - @GetMapping("/listContact") - @PreAuthorize("hasRole('sys:user:contact')") - public R> getList2(SysUser param){ - param.setTenantId(AuthContextUtils.getTenant()); - param.setOrderByPinYin(1); - param.setServingState(1); - List list = sysUserService.listUser(param); - //前端页面展示参数 - return R.ok(list); - } - /** * 列表查询 * @param param @@ -320,11 +229,11 @@ public class SysUserController { * @param id * @return */ - @SysLog(title = "用户ID查询",biz = BizType.QUERY) + @SysLog(title = "用户查询",biz = BizType.QUERY) @GetMapping("/getById/{id}") @PreAuthorize("hasRole('sys:user:query')") public R getById(@PathVariable("id") String id){ - SysUser sysUser = sysUserService.getById2(id); + SysUser sysUser = sysUserService.getById(id); if(sysUser==null){ return R.ok(); } @@ -356,8 +265,6 @@ public class SysUserController { param.setAccount(param.getMobile()); param.setPassword(SecureUtil.md5(GySysConst.DEFAULT_PASSWORD)); boolean result = sysUserService.save(param); - SysUserTenant userTenant = param.toSysUserTenant(AuthContextUtils.getTenant()); - sysUserTenantService.save(userTenant); if(param.getId()!=null&& com.qs.serve.common.util.CollectionUtil.isNotEmpty(param.getRoleIds())){ sysRoleService.saveUserRole4Edit(param.getRoleIds(),param.getId()); } @@ -373,7 +280,7 @@ public class SysUserController { @PostMapping("/resetPwd/{uid}") @PreAuthorize("hasRole('sys:user:reset')") public R resetPwd(@PathVariable("uid") String uid){ - SysUser sysUser = sysUserService.getById2(uid); + SysUser sysUser = sysUserService.getById(uid); if(sysUser.getSuperFlag().equals(1)){ Assert.throwEx("最高级管理员不可重置密码"); } @@ -403,7 +310,7 @@ public class SysUserController { param.setSuperFlag(null); param.setPassword(null); param.setUpdateTime(LocalDateTime.now()); - boolean result = sysUserService.updateById2(param); + boolean result = sysUserService.updateById(param); return R.isTrue(result); } @@ -432,10 +339,10 @@ public class SysUserController { @LimitSubmit(interval = 5000) public R tranPost(@RequestBody @Valid SysUserTranPostParam param){ SysPost post = sysPostService.getById(param.getPostId()); - SysUser sysUser = sysUserService.getById2(param.getUserId()); + SysUser sysUser = sysUserService.getById(param.getUserId()); sysUser.setDeptId(post.getDeptId()); sysUser.setPositionId(post.getId()); - sysUserService.updateById2(sysUser); + sysUserService.updateById(sysUser); return R.ok(); } @@ -449,9 +356,9 @@ public class SysUserController { @PreAuthorize("hasRole('sys:user:leave')") @LimitSubmit(interval = 5000) public R leave(@RequestBody @Valid SysUserLeaveParam param){ - SysUser sysUser = sysUserService.getById2(param.getUserId()); + SysUser sysUser = sysUserService.getById(param.getUserId()); sysUser.setServingState(param.getLeaveState()); - sysUserService.updateById2(sysUser); + sysUserService.updateById(sysUser); return R.ok(); } diff --git a/src/main/java/com/qs/serve/modules/sys/controller/SysUserRoleController.java b/src/main/java/com/qs/serve/modules/sys/controller/SysUserRoleController.java deleted file mode 100644 index e08cdc0..0000000 --- a/src/main/java/com/qs/serve/modules/sys/controller/SysUserRoleController.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.qs.serve.modules.sys.controller; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.qs.serve.common.model.annotation.SysLog; -import com.qs.serve.common.model.dto.PageVo; -import com.qs.serve.common.model.dto.R; -import com.qs.serve.common.model.enums.BizType; -import com.qs.serve.common.util.PageUtil; -import com.qs.serve.modules.sys.entity.SysUserRole; -import com.qs.serve.modules.sys.service.SysUserRoleService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.validation.Valid; -import java.util.List; - -/** - * 系统：用户角色 - * @author YenHex - * @since 2022-03-01 - */ -@Slf4j -//@AllArgsConstructor -//@RestController -//@RequestMapping("sys/userRole") -public class SysUserRoleController { - - private SysUserRoleService sysUserRoleService; - - /** - * 查询列表 - * @param param - * @return - */ - @GetMapping("/page") - @PreAuthorize("hasRole('sys:userRole:query')") - public R> getList(SysUserRole param){ - PageUtil.startPage(); - List list = sysUserRoleService.list(new QueryWrapper<>(param)); - return R.byPageHelperList(list); - } - - /** - * 根据ID查询 - * @param id - * @return - */ - @GetMapping("/getById/{id}") - @PreAuthorize("hasRole('sys:userRole:query')") - public R getById(@PathVariable("id") String id){ - SysUserRole sysUserRole = sysUserRoleService.getById(id); - return R.ok(sysUserRole); - } - - /** - * 保存 - * @param param - * @return - */ - @SysLog(title = "用户授权",biz = BizType.GRANT) - @PostMapping("/save") - @PreAuthorize("hasRole('sys:userRole:insert')") - public R save(@RequestBody @Valid SysUserRole param){ - boolean result = sysUserRoleService.save(param); - return R.isTrue(result); - } - - /** - * 根据ID更新 - * @param param - * @return - */ - @SysLog(title = "用户授权",biz = BizType.GRANT) - @PostMapping("/updateById") - @PreAuthorize("hasRole('sys:userRole:update')") - public R updateById(@RequestBody @Valid SysUserRole param){ - boolean result = sysUserRoleService.updateById(param); - return R.isTrue(result); - } - - /** - * 删除 - * @param id - * @return - */ - @SysLog(title = "用户授权",biz = BizType.GRANT) - @PostMapping("/deleteById/{id}") - @PreAuthorize("hasRole('sys:userRole:delete')") - public R deleteById(@PathVariable("id") String id){ - boolean result = sysUserRoleService.removeById(id); - return R.isTrue(result); - } - -} - diff --git a/src/main/java/com/qs/serve/modules/sys/entity/SysDept.java b/src/main/java/com/qs/serve/modules/sys/entity/SysDept.java index d3cfb60..113c205 100644 --- a/src/main/java/com/qs/serve/modules/sys/entity/SysDept.java +++ b/src/main/java/com/qs/serve/modules/sys/entity/SysDept.java @@ -41,6 +41,16 @@ public class SysDept implements Serializable { /** 负责人 */ private String mgrUserId; + /** 级别路径 */ + private String levelPath; + + /** 是否维修部门 */ + private Integer isRepair; + + /** 类型【0集团部门 01校区部门 】 */ + @NotNull(message = "类型不能为空") + private Integer type; + /** 创建时间 */ @TableField(fill = FieldFill.INSERT) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") diff --git a/src/main/java/com/qs/serve/modules/sys/entity/dto/SysNavUserEditBatch.java b/src/main/java/com/qs/serve/modules/sys/entity/dto/SysNavUserEditBatch.java deleted file mode 100644 index 24a4477..0000000 --- a/src/main/java/com/qs/serve/modules/sys/entity/dto/SysNavUserEditBatch.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.qs.serve.modules.sys.entity.dto; - -import lombok.Data; - -import java.util.List; - -/** - * @author YenHex - * @since 2022/5/31 - */ -@Data -public class SysNavUserEditBatch { - - List items; - -} diff --git a/src/main/java/com/qs/serve/modules/sys/entity/dto/SysUserVo.java b/src/main/java/com/qs/serve/modules/sys/entity/dto/SysUserVo.java index af59804..e497cf9 100644 --- a/src/main/java/com/qs/serve/modules/sys/entity/dto/SysUserVo.java +++ b/src/main/java/com/qs/serve/modules/sys/entity/dto/SysUserVo.java @@ -45,5 +45,4 @@ public class SysUserVo { private Object postInfo; - private List tenantInfos; } diff --git a/src/main/java/com/qs/serve/modules/sys/mapper/SysUserTenantMapper.java b/src/main/java/com/qs/serve/modules/sys/mapper/SysUserTenantMapper.java deleted file mode 100644 index 9741f1e..0000000 --- a/src/main/java/com/qs/serve/modules/sys/mapper/SysUserTenantMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.qs.serve.modules.sys.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.qs.serve.modules.sys.entity.SysUserTenant; - -/** - * 用户校区信息 Mapper - * @author YenHex - * @date 2022-05-23 - */ -public interface SysUserTenantMapper extends BaseMapper { - -} - diff --git a/src/main/java/com/qs/serve/modules/sys/service/SysUserService.java b/src/main/java/com/qs/serve/modules/sys/service/SysUserService.java index 5dd1444..c789195 100644 --- a/src/main/java/com/qs/serve/modules/sys/service/SysUserService.java +++ b/src/main/java/com/qs/serve/modules/sys/service/SysUserService.java @@ -13,18 +13,6 @@ import java.util.List; */ public interface SysUserService extends IService { - /** - * 重构用户参数 - * @param userId - * @return - */ - SysUser getById2(String userId); - - /** - * 重构更新 - * @param sysUser - */ - boolean updateById2(SysUser sysUser); /** * 账号查询 diff --git a/src/main/java/com/qs/serve/modules/sys/service/SysUserTenantService.java b/src/main/java/com/qs/serve/modules/sys/service/SysUserTenantService.java deleted file mode 100644 index b89acb5..0000000 --- a/src/main/java/com/qs/serve/modules/sys/service/SysUserTenantService.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.qs.serve.modules.sys.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.qs.serve.modules.sys.entity.SysUserTenant; - -import java.util.List; - -/** - * 用户校区信息 服务接口 - * @author YenHex - * @date 2022-05-23 - */ -public interface SysUserTenantService extends IService { - /** - * 用户租户信息 - * @param userId - * @return - */ - List listByUserId(String userId); - - /** - * 是否离职 - * @param userId - * @param leave - * @return - */ - List listByUserId(String userId,Boolean leave); - - /** - * 用户租户信息 - * @param userId - * @param tenantId - * @return - */ - SysUserTenant getObject(String userId,String tenantId); -} - diff --git a/src/main/java/com/qs/serve/modules/sys/service/impl/SysDocumentServiceImpl.java b/src/main/java/com/qs/serve/modules/sys/service/impl/SysAttachServiceImpl.java similarity index 81% rename from src/main/java/com/qs/serve/modules/sys/service/impl/SysDocumentServiceImpl.java rename to src/main/java/com/qs/serve/modules/sys/service/impl/SysAttachServiceImpl.java index 1f09186..740a8b7 100644 --- a/src/main/java/com/qs/serve/modules/sys/service/impl/SysDocumentServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/sys/service/impl/SysAttachServiceImpl.java @@ -16,7 +16,7 @@ import org.springframework.stereotype.Service; @Slf4j @Service @AllArgsConstructor -public class SysDocumentServiceImpl extends ServiceImpl implements SysAttachService { +public class SysAttachServiceImpl extends ServiceImpl implements SysAttachService { } diff --git a/src/main/java/com/qs/serve/modules/sys/service/impl/SysDeptServiceImpl.java b/src/main/java/com/qs/serve/modules/sys/service/impl/SysDeptServiceImpl.java index 32a6b6c..5d8c4b7 100644 --- a/src/main/java/com/qs/serve/modules/sys/service/impl/SysDeptServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/sys/service/impl/SysDeptServiceImpl.java @@ -30,11 +30,9 @@ public class SysDeptServiceImpl extends ServiceImpl impl dept.setId(IdUtil.timeStampId()); if(dept.getParentId().equals(TreeUtil.DEFAULT_PID_STRING)){ dept.setLevelPath(dept.getId()); - dept.setLevelPathNames(dept.getName()); }else{ SysDept parentDept = getById(dept.getParentId()); dept.setLevelPath(parentDept.getLevelPath()+"_"+dept.getId()); - dept.setLevelPathNames(parentDept.getLevelPathNames()+"_"+dept.getName()); } save(dept); return true; diff --git a/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserServiceImpl.java b/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserServiceImpl.java index 7c849b5..676c5bc 100644 --- a/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserServiceImpl.java @@ -33,61 +33,11 @@ public class SysUserServiceImpl extends ServiceImpl impl private final SysUserRoleService sysUserRoleService; private final SysRolePermitMapper sysRolePermitMapper; private final SysPermitService sysPermitService; - private final SysUserTenantService sysUserTenantService; private final SysRoleService sysRoleService; private final SysDeptMapper sysDeptMapper; private final SysMenuMapper sysMenuMapper; - private final SysPostMapper sysPostMapper; - @Override - public SysUser getById2(String userId) { - SysUser sysUser = getById(userId); - if(sysUser==null){ - return null; - } - String tenant = AuthContextUtils.getTenant(); - if(tenant != null){ - SysUserTenant userTenant = sysUserTenantService.getObject(sysUser.getId(),tenant); - if(userTenant==null){ - return null; - } - sysUser.setIcCard(userTenant.getIcCard()); - sysUser.setEnterDate(userTenant.getEnterDate()); - sysUser.setFormalDate(userTenant.getFormalDate()); - sysUser.setFormalStatus(userTenant.getFormalStatus()); - sysUser.setServingState(userTenant.getServingState()); - sysUser.setServingPactDate(userTenant.getServingPactDate()); - sysUser.setServingPactDateEnd(userTenant.getServingPactDateEnd()); - sysUser.setDeptId(userTenant.getDeptId()); - sysUser.setHrType(userTenant.getHrType()); - sysUser.setPositionId(userTenant.getPositionId()); - sysUser.setPositionType(userTenant.getPositionType()); - }else { - sysUser.setEnterDate(null); - sysUser.setFormalDate(null); - sysUser.setFormalStatus(null); - sysUser.setServingState(null); - sysUser.setServingPactDate(null); - sysUser.setServingPactDateEnd(null); - sysUser.setDeptId(null); - sysUser.setHrType(null); - sysUser.setPositionId(null); - sysUser.setPositionType(null); - } - return sysUser; - } - @Override - @Transactional(rollbackFor = Exception.class) - public boolean updateById2(SysUser sysUser) { - updateById(sysUser); - SysUserTenant userTenant = sysUser.toSysUserTenant(AuthContextUtils.getTenant()); - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(SysUserTenant::getTenantId,userTenant.getTenantId()); - wrapper.eq(SysUserTenant::getId,userTenant.getId()); - sysUserTenantService.update(userTenant,wrapper); - return true; - } @Override public SysUser getByAccount(String acc) { diff --git a/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserTenantServiceImpl.java b/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserTenantServiceImpl.java deleted file mode 100644 index 6b903bb..0000000 --- a/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserTenantServiceImpl.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.qs.serve.modules.sys.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.qs.serve.modules.sys.entity.SysTenant; -import com.qs.serve.modules.sys.service.SysTenantService; -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import com.qs.serve.modules.sys.entity.SysUserTenant; -import com.qs.serve.modules.sys.service.SysUserTenantService; -import com.qs.serve.modules.sys.mapper.SysUserTenantMapper; - -import java.util.List; - -/** - * 用户校区信息 服务实现类 - * @author YenHex - * @since 2022-05-23 - */ -@Slf4j -@Service -@AllArgsConstructor -public class SysUserTenantServiceImpl extends ServiceImpl implements SysUserTenantService { - - private SysTenantService tenantService; - - @Override - public List listByUserId(String userId) { - return listByUserId(userId,null); - } - - @Override - public List listByUserId(String userId, Boolean leave) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(SysUserTenant::getId,userId); - if(leave!=null){ - wrapper.eq(SysUserTenant::getServingState,leave?0:1); - } - List list = list(wrapper); - for (SysUserTenant userTenant : list) { - SysTenant tenant = tenantService.getById(userTenant.getTenantId()); - userTenant.setTenant(tenant.getName()); - } - return list; - } - - @Override - public SysUserTenant getObject(String userId, String tenantId) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(SysUserTenant::getId,userId); - wrapper.eq(SysUserTenant::getTenantId,tenantId); - return getOne(wrapper); - } - -} -