Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panz...

luoxinwu

2024-03-05 c88d1658a2b6b51ed1a81c3be3e9102b661970f3

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewStriveForServiceImpl.java

@@ -38,17 +38,17 @@
    @Override
    public String getAllintegral(String type,String userId)
    {
        if(StringUtils.equals("1",type))
        {
//        if(StringUtils.equals("1",type))
//        {
            List<String> userIds=new ArrayList<>();
            userIds.add(userId);
            return baseMapper.getAllintegral(userIds);
        }
        else
        {
            List<String> userIds=baseMapper.getPartyMember(userId);
            return baseMapper.getAllintegral(userIds);
        }
//        }
//        else
//        {
//            List<String> userIds=baseMapper.getPartyMember(userId);
//            return baseMapper.getAllintegral(userIds);
//        }
    }

    @Override