From 5e64f452ba0bed79d61823366aea3af1e609a76a Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Sun, 27 Apr 2025 16:37:25 +0800 Subject: [PATCH] 1 --- .../CanteenDailyMenuController.java | 2 +- .../admin/controller/SysDeptController.java | 12 ---------- .../admin/controller/SysUserController.java | 12 ---------- .../pjcloud/admin/service/SysDeptService.java | 2 -- .../service/impl/SysDeptServiceImpl.java | 23 ------------------- .../service/impl/SysMessageServiceImpl.java | 2 ++ .../service/impl/SysUserServiceImpl.java | 7 ------ 7 files changed, 3 insertions(+), 57 deletions(-) diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenDailyMenuController.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenDailyMenuController.java index 65368d40b..715d8f8d2 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenDailyMenuController.java +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenDailyMenuController.java @@ -119,7 +119,7 @@ public class CanteenDailyMenuController { } /** * 通过id删除每日菜谱 - * + *1 * @param ids id列表 * @return R */ diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysDeptController.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysDeptController.java index bd7473935..4fc568a35 100644 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysDeptController.java +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysDeptController.java @@ -107,18 +107,6 @@ public class SysDeptController { } - /** - * - * 查询所有，无权限过滤 - * simpleTree - * @param deptName - * @param parentId - * @return - */ - @GetMapping(value = "/simpleTree") - public R getSimpleTree(String deptName, Long parentId) { - return R.ok(sysDeptService.selectSimpleTree(deptName, parentId)); - } /** * 添加 diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserController.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserController.java index 2ff161506..84cb2da46 100644 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserController.java +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserController.java @@ -372,18 +372,6 @@ public class SysUserController { return R.ok(userService.listUserIdByDeptId(deptId,name)); } - /** - * 根据部门id查询用户列表 - * @param deptId - * @return - */ -// @Inner - @GetMapping("/getUserIdListByDeptId") - public R> getUserIdListByDeptId(@RequestParam("deptId")Long deptId, - @RequestParam(value = "name",required = false) String name) { - return R.ok(userService.listUserIdByDeptId(deptId,name)); - } - /** * 根据用户名获取用户列表 * diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/SysDeptService.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/SysDeptService.java index dd8e0fc01..95c27a8fa 100644 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/SysDeptService.java +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/SysDeptService.java @@ -134,6 +134,4 @@ public interface SysDeptService extends IService { List getInnerDept(DeptAllListDto dto); - - List> selectSimpleTree(String deptName, Long parentId); } diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysDeptServiceImpl.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysDeptServiceImpl.java index 8a44ba61b..e4b5ec947 100644 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysDeptServiceImpl.java +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysDeptServiceImpl.java @@ -456,29 +456,6 @@ public class SysDeptServiceImpl extends ServiceImpl impl ); } - @Override - public List> selectSimpleTree(String deptName, Long parentId) { - // 查询全部部门 - List deptAllList = deptMapper - .selectList(Wrappers.lambdaQuery().like(StrUtil.isNotBlank(deptName), SysDept::getName, deptName)); - - List> collect = deptAllList.stream() - .filter(dept -> dept.getDeptId().intValue() != dept.getParentId()) - .sorted(Comparator.comparingInt(SysDept::getSortOrder)) - .map(dept -> { - TreeNode treeNode = new TreeNode<>(); - treeNode.setId(dept.getDeptId()); - treeNode.setParentId(dept.getParentId()); - treeNode.setName(dept.getName()); - return treeNode; - }) - .collect(Collectors.toList()); - - List> build = TreeUtil.build(collect, parentId == null ? 0 : parentId); - - return build; - - } /** * 递归查询所有子节点。 diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysMessageServiceImpl.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysMessageServiceImpl.java index d1c2fbeaa..e973abb44 100644 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysMessageServiceImpl.java +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysMessageServiceImpl.java @@ -63,6 +63,7 @@ import org.dromara.oa.core.weTalk.config.WeTalkConfig; import org.dromara.sms4j.aliyun.config.AlibabaConfig; import org.dromara.sms4j.api.SmsBlend; import org.dromara.sms4j.cloopen.config.CloopenConfig; +import org.dromara.sms4j.comm.utils.SmsHttpUtils; import org.dromara.sms4j.core.factory.SmsFactory; import org.dromara.sms4j.ctyun.config.CtyunConfig; import org.dromara.sms4j.dingzhong.config.DingZhongConfig; @@ -336,6 +337,7 @@ public class SysMessageServiceImpl extends ServiceImpl impl - public List listUserIdByDeptId(Long deptId, String name) { - List sysUsers = baseMapper.selectList(Wrappers.lambdaQuery() - .eq(SysUser::getDeptId, deptId) - .like(StrUtil.isNotBlank(name),SysUser::getName, name)); - return com.bsd.pjcloud.common.core.util.BeanUtils.toBean(sysUsers, SimpleUserListVO.class); - } - }