liurunyu
2025-05-26 ffe006d278d3bc2014a13be90081ee12aa128675
pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/schedule/ScheduleSv.java
@@ -106,8 +106,8 @@
        return scheduleDao.selectByPrimaryKey(id);
    }
    public List<BaUser> selectById() {
        List<BaUser> userList = baUserDao.getUserList();
    public List<BaUser> selectAllUsers() {
        List<BaUser> userList = baUserDao.selectAll();
        return userList;
    }
@@ -125,11 +125,11 @@
    public List<JSONObject> selectPlan(QueryVo vo) {
        List<JSONObject> list = assemblyPlanDao.selectByPlanName(vo.planName);
        Map<Long, JSONObject> map = new ConcurrentHashMap<>(); // 使用并发安全的Map
        Map<String, JSONObject> map = new ConcurrentHashMap<>(); // 使用并发安全的Map
        for(JSONObject item:list){
            Long planId = (Long) item.getObj("planId");
            String planId = String.valueOf(item.getObj("planId"));
            JSONObject innerObject = new JSONObject()
                    .set("nodeId", item.getObj("nodeId"))
                    .set("nodeId", String.valueOf(item.getObj("nodeId")))
                    .set("content", item.getObj("content"));
            if(map.containsKey(planId)){
                JSONArray array = (JSONArray)map.get(planId).get("nodes");