1

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
      */

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));
-    }
 
     /**
      * 添加

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<List<SimpleUserListVO>> getUserIdListByDeptId(@RequestParam("deptId")Long deptId,
-                                                           @RequestParam(value = "name",required = false) String name) {
-        return R.ok(userService.listUserIdByDeptId(deptId,name));
-    }
-
     /**
      * 根据用户名获取用户列表
      *

pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/SysDeptService.java

@@ -134,6 +134,4 @@ public interface SysDeptService extends IService<SysDept> {
     List<SysDept> getInnerDept(DeptAllListDto dto);
 
 
-
-    List<Tree<Long>> selectSimpleTree(String deptName, Long parentId);
 }

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<SysDeptMapper, SysDept> impl
         );
     }
 
-    @Override
-    public List<Tree<Long>> selectSimpleTree(String deptName, Long parentId) {
-        // 查询全部部门
-        List<SysDept> deptAllList = deptMapper
-                .selectList(Wrappers.<SysDept>lambdaQuery().like(StrUtil.isNotBlank(deptName), SysDept::getName, deptName));
-
-        List<TreeNode<Long>> collect = deptAllList.stream()
-                .filter(dept -> dept.getDeptId().intValue() != dept.getParentId())
-                .sorted(Comparator.comparingInt(SysDept::getSortOrder))
-                .map(dept -> {
-                    TreeNode<Long> treeNode = new TreeNode<>();
-                    treeNode.setId(dept.getDeptId());
-                    treeNode.setParentId(dept.getParentId());
-                    treeNode.setName(dept.getName());
-                    return treeNode;
-                })
-                .collect(Collectors.toList());
-
-        List<Tree<Long>> build = TreeUtil.build(collect, parentId == null ? 0 : parentId);
-
-        return build;
-
-    }
 
     /**
      * 递归查询所有子节点。

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<SysMessageMapper, SysMess
 //                remoteLogService.saveLog(sysLog);
 //            });
 //        }
+
         return R.ok();
     }
 

pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java

@@ -924,11 +924,4 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
 
 
-    public List<SimpleUserListVO> listUserIdByDeptId(Long deptId, String name) {
-        List<SysUser> sysUsers = baseMapper.selectList(Wrappers.<SysUser>lambdaQuery()
-                .eq(SysUser::getDeptId, deptId)
-                .like(StrUtil.isNotBlank(name),SysUser::getName, name));
-        return com.bsd.pjcloud.common.core.util.BeanUtils.toBean(sysUsers, SimpleUserListVO.class);
-    }
-
 }