Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyuji

2024-08-26 d3dfcd3e96cb0f2b04cfe973e4f348ee5fe96032

 north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java

@@ -663,6 +663,23 @@


    }

    public String mergeFlowCard(Map<String, Object> object) {
        String returns= "false";
        List<FlowCard> flowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("flowCard")), FlowCard.class);
        if (!flowCardList.isEmpty()) {
            List<Map<String, Object>> flowCardList1=flowCardMapper.selectFlowCardMerge(flowCardList.get(0).getProcessId());
            if(flowCardList1.size()==1){
                flowCardMapper.updateFlowCardMerge(flowCardList.get(0).getProcessId());
                returns="true";
            }

        }

        return returns;


    }
}