zjh20250606

zjh

2025-06-06 d76577743763c668a9ebe4ea481e03b62af17596

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java

@@ -165,34 +165,10 @@
            return AjaxResult.error("请输入科室id");
        }
        //根据当前登陆的人的科室id，获取该科室下的所有项目
        List<Long> postIds = sysUser.getPostIds();
        List<Long> ksproList = null;

        String byKey =null;

//        if (postIds != null) {
//            for (Long postId : postIds) {
//                LambdaQueryWrapper<SysUserPost> wq111 = new LambdaQueryWrapper<>();
//                wq111.eq(SysUserPost::getPostId, postId);
//                SysUserPost one = userPostService.getOne(wq111);
//                if (one != null) {
//                    SysPost byId = postService.getById(one.getPostId());
//                    if (byId.getPostName().equals("录入员")) {
//                        ksproList = projectService.getKsTjProjectIdListBydeptId(String.valueOf(ksId));
//                    }
//                    if (byId.getPostName().equals("前台")) {
//                        byKey = configService.selectConfigByKey("qt_kjksid");
//
//                    }
//                }
//            }
//        } else {
//            ksproList = projectService.getKsTjProjectIdList();
//        }
//
//        if (ksproList == null || ksproList.isEmpty()) {
//            return AjaxResult.error("请完善科室项目信息");
//        }
        SysDept dept = deptService.getById(ksId);

        List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
        if (null != roles && !roles.isEmpty()) {
@@ -208,6 +184,14 @@
        if ( StringUtil.isNotBlank(byKey)) {
            ksId+=(","+byKey);
        }

        if(null !=dept){
            if(StringUtil.isNotBlank(dept.getSjks())){
                ksId+=(","+dept.getSjks());
            }
        }


        if (type == 0) {
            map = deptService.getSysDeptYjWjCustomerList13(ksId, name, tjNumber, 0, page, pageSize);
        }
@@ -594,6 +578,7 @@
            }
            ksId = Math.toIntExact(sysUser.getDeptId());
        }
        SysDept dept = deptService.getById(ksId);
        String configByKey = configService.selectConfigByKey("sfkqdyhis");
        // 判断是否收费 请求接口
        TjOrder tjOrder = orderService.getOrderByTjNum(tjNumber);
@@ -660,6 +645,15 @@
                }
            }
        }
        if(null !=dept){
            if(StringUtil.isNotBlank(dept.getSjks())){
                String[] arr = dept.getSjks().split(","); // 根据逗号进行切割
                for (String s : arr) {
                    int num = Integer.parseInt(s); // 将每个子字符串转换为integer类型
                    split.add(num); // 添加到列表中
                }
            }
        }
        log.info("查询关联科室集合 ->{}",split);
        List<TjOrderRemark> list;
        if (null != sysUser && sysUser.getUserName().equals("10001")) {